Added additonal question types
Changes made to menuviewcontroller
Merge branch 'master' of https://github.com/alexanderlipsett/WaitingGame

Conflicts:
	WaitingGame.xcodeproj/project.xcworkspace/xcshareddata/WaitingGame.xccheckout