Committing to work on other things

Started to split up the component model.

I think inheritance may be preferred for what I’m doing but I’m
checking with prof Z first and moving onto other things. Therefore, the
code is in an un-working state.
Code clean up and splitting up the model

Model doesn’t quite update correctly with deflectors.
Switch changing doesn’t turn off power
deflectors now work,

the interaction is still a bit strange because of how the grid images
are placed now
deflector updates correctly

need to remove from super
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
fixing project file
Resolved conflicts

To fix:
explosion not in the right place
wire on state
switch turn off circuit
deleted commented out code
switch change now stops circuit
More bug fixes

Got deflectors working.
Batteries now light up.
Last thing is to get the explosions to be at the right place
disable all tests
Merge remote-tracking branch 'origin/ModelSplitup' into ModelSplitup
ready for merge
ready to merge
Merge branch 'PowerUP_V1.1' into ModelSplitup

Conflicts:
	Battery.h
	Battery.m
	ComponentModel.m
	Components.xcassets/receivers/receiverTopXRXB.imageset/Contents.json
	GameModel.h
	GameModel.m
	GameViewController.m
	Grid.h
	Grid.m
	MenuViewController.m
	PowerUP.xcodeproj/project.pbxproj
	PowerUP.xcodeproj/project.xcworkspace/xcuserdata/cyrushuang.xcuserdatad/UserInterfaceState.xcuserstate
	PowerUP.xcodeproj/project.xcworkspace/xcuserdata/seanokeeffe.xcuserdatad/UserInterfaceState.xcuserstate
	PowerUP.xcodeproj/xcuserdata/seanokeeffe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	PowerUP/Base.lproj/Main.storyboard
	PowerUP/Deflector.m
	PowerUP/Emitter.m
	PowerUP/Images.xcassets/buttons/backButtonOn.imageset/Contents.json
	PowerUP/Images.xcassets/instructions/instructions1.imageset/Contents.json
	PowerUP/Images.xcassets/instructions/instructions10.imageset/Contents.json
	PowerUP/Images.xcassets/instructions/instructions2.imageset/Contents.json
	PowerUP/Images.xcassets/instructions/instructions3.imageset/Contents.json
	PowerUP/Images.xcassets/instructions/instructions4.imageset/Contents.json
	PowerUP/Images.xcassets/instructions/instructions5.imageset/Contents.json
	PowerUP/Images.xcassets/instructions/instructions6.imageset/Contents.json
	PowerUP/Images.xcassets/instructions/instructions7.imageset/Contents.json
	PowerUP/Images.xcassets/instructions/instructions8.imageset/Contents.json
	PowerUP/Images.xcassets/instructions/instructions9.imageset/Contents.json
	PowerUP/InstructionsText.plist
	PowerUP/InstructionsTextChinese.plist
	PowerUP/InstructionsTextSpanish.plist
	PowerUP/InstructionsViewController.h
	PowerUP/InstructionsViewController.m
	PowerUP/LaserModel.m
	PowerUP/MenuText.plist
	PowerUP/MenuTextChinese.plist
	PowerUP/MenuTextSpanish.plist
	PowerUP/Receiver.m
	PowerUP/StoryTextSpanish.plist
	PowerUP/level14
	PowerUP/level16
	PowerUP/level9
	PowerUPTests/GameModelTests.m
	Switch.h
	Switch.m
	Wire.m
fix all conflicts