Merge branch 'Dev' into notification and made a method for showing a death pop-up

Conflicts:
CrayCray/src/se/chalmers/dat255/craycray/MainActivity.java