PreGameMenu

...
PreGameMenu update

updated class and Constants
Fixed minor error in PreGameMenu

PlayerCount update
Merging menus branch

Conflicts:
	game/src/no/ntnu/folk/game/Constants.java
	game/src/no/ntnu/folk/game/states/menus/PreGameMenu.java
added lost options in merge
Added JavaDoc to PreGameMenu
added lost constants lost in merge
Merge branch 'Menus' of ssh://git@github.com/Daveiac/AndroidGameProject.git into Menus
Added a GameModel class

GameModel class to keep track of the gameState during gameplay
PreGameMenu minor update
Renamed levels to raw
GameModel update
Merge remote-tracking branch 'origin/Gameplay'
Merge branch 'master' of https://github.com/Daveiac/AndroidGameProject
Merge remote-tracking branch 'origin/Menus'
Fixed buttoms
tok away errors
Merge branch 'Gameplay' of https://github.com/Daveiac/AndroidGameProject into Gameplay
Now im sure buttoms works
Merge branch 'Gameplay'