Moved stuff around, added smoke rings
Merge branch 'master' of gh:Carolinitzny/BaconGameJam07

Conflicts:
	main.lua