Quick update to PlayerCount

default player to 2 instead of 1
Menu Update (PreGameMenu)

updated PreGameMenu and relevant classes
PreGameMenu

...
Revert "Menu Update (PreGameMenu)"

This reverts commit 6c6ae743fcd6b96501d0f30c0ff17925ab5dc3be.
Created models/LevelModel, controllers/LevelController,
levels/levelParser
PreGameMenu update

updated class and Constants
created res/levels/test.level

levelParser - done something (sry)
Merge branch 'b2branch'
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
changed folder of test.level to test/raw
PreGameMenu minor update
Renamed levels to raw
Merge remote-tracking branch 'origin/Gameplay'
Merge branch 'master' of https://github.com/Daveiac/AndroidGameProject
Merge remote-tracking branch 'origin/Menus'