Ali #20

Merged

alisolarflare merged 3 commits from Ali into master

2016-11-06 22:18:56 +00:00

Author	SHA1	Message	Date
alisolarflare	bbacdc3529	Tried to fix up powerup	2016-11-06 17:12:24 -05:00
alisolarflare	45b88354e5	Pretty much the command equivalent to hard coding	2016-11-06 16:44:56 -05:00
alisolarflare	419dddc4b1	Merge remote-tracking branch 'refs/remotes/origin/master' into Ali	2016-11-05 16:04:41 -04:00