no changes
Merge branch 'Dev' into deadfixes
screen orientation set to portrait in RussianActivity
splash screen works & no screenrotation
Merged in recactoring into Dev
Death-refactoring: DeathException deleted.

Russian death pop-up works
Merge remote-tracking branch 'origin/Dev' into deadfixes

Conflicts:
	CrayCray/src/se/chalmers/dat255/craycray/activity/MainActivity.java
	CrayCray/src/se/chalmers/dat255/craycray/model/DeadException.java
	CrayCray/src/se/chalmers/dat255/craycray/model/NeedsModel.java
bigger cray
gun added
Merge branch 'Dev' of https://github.com/Jonate/Dat255-CrayCray into Dev
gun and bigger cray
pop-up appears when entering prgrm after death
buttons fixed
Merge branch 'button_graphics' into Dev
Merge branch 'Dev' into testing
mergefix