Ingen endring, har konflikt
Merge remote-tracking branch 'origin/master'

Conflicts:
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/MainActivity$1.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$id.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$integer.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$layout.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$menu.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$string.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$style.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$styleable.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/SelectionFragment$1.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/SelectionFragment$2.class
	HIOFCommuting/gen/com/bachelor/hiofcommuting/R.java