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

Conflicts:
	bin/classes/no/gruppe3/seprototype/MainActivity.class