Trying to launch MillionaireView for testing purposes.
Merge branch 'master' of https://github.com/angelafz/edugames

Conflicts:
	edugames/GameViewController.h
Merge branch 'master' of https://github.com/angelafz/edugames
Trying to merge
Merge remote-tracking branch 'origin/master'