rensket opp
Merge branch 'master' of https://github.com/davidhel/SEprototype

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/no/gruppe3/seprototype/MainActivity.class
	res/values/strings.xml
	src/no/gruppe3/seprototype/MainActivity.java