fiks
Merge branch 'master' of https://github.com/martinbang/oblig5

Conflicts:
	res/values/strings.xml
	src/com/gpstracker/MainActivity.java