Farticles!
Merge branch 'master' of https://github.com/Bradshaw/froglick

Conflicts:
	src/GameObject.lua
	src/Spaceman.lua