cureButton added
merge fix
merge fix
cleanup case
merge fix
happiness done
Merge remote-tracking branch 'origin/Dev' into Ill-notification

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