added powerup
Merge branch 'master' of https://github.com/swestwood/proto1-cs247-p3

Conflicts:
	public/javascript/main.coffee