ugh merge hell to come
Merge pull request #3 from GBecker80/master

Powerups
Merge branch 'mybranch'

Conflicts:
	jam_template/js/Main.js
blah
framerate stuff