Added new weapon RIFLE, now dead player will be gone from the field
added tombstone for player whos dead
added end turn Button
gun cooldown removed, insted a player can only fire once per turn think this is better?
fixed some minor logic bugs
Changed if-if statement to if-else statement

One if was the inverse of the other...
Added newline at the end of the level files
Added start positions in flat.level (should now work with up to six players)
Attempt at making the formatting consistent across the entire project.
Major changes. See notes below. (Note: selecting levels might be temporarily out of order)
Added model and token for tombStone.
Added constant MIN_HEALTH
Removed isDead and tombStone from PlayerModel. (Functionality moved elsewhere)
Fixed isGameOver (previously named gameIsOver)
Started moving PreGameMenu options to a gameMenu. Level is currently missing.
Minor cleanup.
Draw tombstones before players and projectiles
Using gameModel for levels. Fixed weapon temperature.
Instant end turn
Fixed player positions when changing maps
Added EndGameMenu when game is over
Force landscape
Fixed collision boxes
Merge branch 'Gameplay' into TheGridBranch

Conflicts:
	game/res/raw/flat.level
	game/res/raw/test.level
	game/src/no/ntnu/folk/game/gameplay/levels/controllers/LevelParser.java
	game/src/no/ntnu/folk/game/gameplay/levels/views/TokenFactory.java
	game/src/no/ntnu/folk/game/gameplay/levels/views/Wall.java
	game/src/no/ntnu/folk/game/gameplay/models/GameModel.java
	game/src/no/ntnu/folk/game/gameplay/models/LevelModel.java
Change in levelmodel to take an number as argument insted of the level
id.