Stub model
merge with master
Adding some particle emissions.
Particle tests
Merge conflict
Adding bullet and entity models. We may not want to use the entity model.
Commit so I can pull from master.
Adding bullet start/stop.
Particle originates from hero.
Merge remote-tracking branch 'origin/master' into GunModelBranch
Shooty action - not fully complete but is shooting from hero.
Merge remote-tracking branch 'origin/GunModelBranch'

Conflicts:
	8bit-zombie-arcade.xcodeproj/project.pbxproj
	8bit-zombie-arcade/ZAMyScene.m
	8bit-zombie-arcade/ZAZombieSpriteNode.m
Merge pull request #10 from manimaul/particles

Christians GunModelBranch merged with current master