minor clean up of main activity
Merge branch 'develop' of https://github.com/villepetersson/DAT255-Grupp12 into develop

Conflicts:
	Android/DAT255Grupp12Project/DAT255Grupp12/src/main/java/se/dat255/grupp12/MainActivity.java