Fuck
Merge branch 'master' of https://github.com/HolyShitCollective/GrandmasHouse

Conflicts:
	index.html
Merge branch 'master' of https://github.com/HolyShitCollective/GrandmasHouse
Yes
Power-up icons
Merge branch 'master' of https://github.com/HolyShitCollective/GrandmasHouse
Draw Power Ups
Merge branch 'master' of https://github.com/HolyShitCollective/GrandmasHouse