Added a blank line so I could make another commit to make the branches distinguishable
Added left navigation table to the guardian menu
Made minor changes to the navigation bar
Added the statisticsViewController
Merge branch 'david-dev' into development
Added basic UI layout
Missed file from last commit
Added icons to the guardian menu
Merge branch 'add-assets' into development
Added Core Data Model For Users
Added a dummy problem.
Added level complete popup
Merge branch 'david-game-engine' into development

Conflicts:
	Social Solver/Social Solver.xcodeproj/project.pbxproj
	Social Solver/Social Solver.xcodeproj/project.xcworkspace/xcuserdata/dwoods.xcuserdatad/UserInterfaceState.xcuserstate

Merging partial completion of the game engine to avoid a large commit later
Game engine currently has dummy problems, detects correct vs. incorrect answers and can display the problem image
TODO: Allow playing of a sequence of problems.
- Store problems in a database
- Allow video to play during problems
Made a rough sketh of the Login View

Added LoginUserSelectionCell for login icons
Pictures
Version0.5
Version0.55
Set up Login View to display users from db
Version0.6
Added Login Prompt to Login Screen
Merge branch 'development' into merchleg-login
Changed Deployment Target to iOS 6.0