Ryan's changes to MathMasters
Merge branch 'countingStarsGame' of https://github.com/ndmacdon/MathMastersProject into countingStarsGame

Conflicts:

MathMasters.xcodeproj/project.xcworkspace/xcuserdata/whatsername.xcuserd
atad/UserInterfaceState.xcuserstate
	MathMasters/AppDelegate.h
	MathMasters/AppDelegate.m
	MathMasters/GlobalVariables.h
	MathMasters/GlobalVariables.m
	MathMasters/LogInViewController.m
	MathMasters/ViewController.h
	MathMasters/ViewController.m
Merge pull request #2 from ndmacdon/countingStarsGame

Ryan's changes to MathMasters