Moved setContentView from activity to controller for game over and main menu. Added to gameplay contructor to instantiate
Merge branch 'master' of https://github.com/jeffcirka/Lyra

Conflicts:
	eartrainer/src/main/java/com/lyra/eartrainer/control/PauseController.java
Merge branch 'master' of https://github.com/jeffcirka/Lyra

Conflicts:
	eartrainer/src/main/java/com/lyra/eartrainer/model/GamePlay.java
	eartrainer/src/main/java/com/lyra/eartrainer/model/Round.java