lelellelel
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29
Player stuff
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29
Full implementation God Smash
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29

Conflicts:
	src/js/assets.js