BUGFIX: 1 shot per turn
boolean cold is moved from weaponmodel to playermodel.
Merge branch 'Gameplay' of
https://github.com/Daveiac/AndroidGameProject.git into Gameplay

Conflicts:
	game/src/no/ntnu/folk/game/gameplay/models/GameModel.java
	game/src/no/ntnu/folk/game/states/GameState.java
Merge branch 'Gameplay' of https://github.com/Daveiac/AndroidGameProject.git into Gameplay