Merge branch 'PowerUP' into ModelSplitup

Conflicts:
	Battery.h
	Battery.m
	ComponentModel.m
	GameModel.h
	GameModel.m
	GameViewController.m
	Grid.h
	Grid.m
	PowerUP.xcodeproj/project.pbxproj

PowerUP.xcodeproj/project.xcworkspace/xcuserdata/seanokeeffe.xcuserdatad
/UserInterfaceState.xcuserstate

PowerUP.xcodeproj/xcuserdata/seanokeeffe.xcuserdatad/xcdebugger/Breakpoi
nts_v2.xcbkptlist
	PowerUP/Base.lproj/Main.storyboard
	PowerUP/Deflector.m
	PowerUP/Emitter.m
	PowerUP/LaserModel.m
	PowerUP/Receiver.m
	PowerUP/level10
	PowerUP/level4
	PowerUP/level6
	Switch.h
	Switch.m
	Wire.m