icarreras/OOP — pull request #4 by icarreras (2014-03-18 20:16:27+00:00)
Title: Merge the main menu and the gamecontroller

Now the master will have complete the mainmenu and everything from game controller