Test 2: Kommentar fra Olsn
Merge branch 'master' of https://github.com/patricmj/HIOFCommuting

Conflicts:
	HIOFCommuting/src/com/bachelor/hiofcommuting/MainActivity.java