added laser components
fix some style issues
Merge pull request #7 from zsweedyk/PowerUP_laser

added laser components
commit before merge
conflict resolution
conflict resolution

Conflicts:
	GameModel.m
	GameViewController.m
Revert to f6249a2
resolve conflicts