Merge branch 'Stephen' into Igors-New

Conflicts:
Prototypes/basicGame2/Scrubbles.xcodeproj/project.pbxproj

Prototypes/basicGame2/basicGame.xcodeproj/project.xcworkspace/xcuserdata
/Katie.xcuserdatad/UserInterfaceState.xcuserstate

Prototypes/basicGame2/basicGame.xcodeproj/project.xcworkspace/xcuserdata
/RobertSiry.xcuserdatad/UserInterfaceState.xcuserstate

Prototypes/basicGame2/basicGame.xcodeproj/xcuserdata/Katie.xcuserdatad/x
cdebugger/Breakpoints_v2.xcbkptlist

Prototypes/basicGame2/basicGame.xcodeproj/xcuserdata/RobertSiry.xcuserda
tad/xcdebugger/Breakpoints_v2.xcbkptlist
Prototypes/basicGame2/basicGame/Assets/1516x2008.png
Prototypes/basicGame2/basicGame/Assets/1536x2048.png
Prototypes/basicGame2/basicGame/Assets/768x1005.png
Prototypes/basicGame2/basicGame/Assets/768x1024.png
Prototypes/basicGame2/basicGame/Assets/playerIcon.png
Prototypes/basicGame2/basicGame/AudioManager.h
Prototypes/basicGame2/basicGame/AudioManager.m
Prototypes/basicGame2/basicGame/BattleViewController.h
Prototypes/basicGame2/basicGame/BattleViewController.m
Prototypes/basicGame2/basicGame/BattleViewController.xib
Prototypes/basicGame2/basicGame/GameOverMenuViewController.h
Prototypes/basicGame2/basicGame/GameOverMenuViewController.m
Prototypes/basicGame2/basicGame/GameOverMenuViewController.xib
Prototypes/basicGame2/basicGame/GameOverScene.h
Prototypes/basicGame2/basicGame/GameOverScene.m
Prototypes/basicGame2/basicGame/GameTimer.h
Prototypes/basicGame2/basicGame/GameTimer.m
Prototypes/basicGame2/basicGame/Gameplay.m

Prototypes/basicGame2/basicGame/Images.xcassets/LaunchImage.launchimage/
1536x2048.png

Prototypes/basicGame2/basicGame/Images.xcassets/LaunchImage.launchimage/
768x1024.png
Prototypes/basicGame2/basicGame/MyScene.m
Prototypes/basicGame2/basicGame/PowerNodes.m
Prototypes/basicGame2/basicGame/ViewController.m
Prototypes/basicGame2/basicGame/battle.png
Prototypes/basicGame2/basicGame/enemyNode1.png
Prototypes/basicGame2/basicGame/enemyNode2.png
Prototypes/basicGame2/basicGame/healthdown.png
Prototypes/basicGame2/basicGame/healthup.png
Prototypes/basicGame2/basicGame/mathTrivaGenerator.h
Prototypes/basicGame2/basicGame/otherTrivaGenerator.h
Prototypes/basicGame2/basicGame/powerup.mp3
Prototypes/basicGame2/basicGame/raleway_thin.otf
Prototypes/basicGame2/basicGame/sendAllNodes.png
Prototypes/basicGame2/mathTrivaGenerator.m
Prototypes/basicGame2/otherTrivaGenerator.m