Lade till a
Merge branch 'master' of https://github.com/Mattadoren/Krogrunda.git

Conflicts:
	src/se/mima/jeda/frsa/krogrunda/MainActivity.java