confligct
Conflict
Merge branch 'master' of https://github.com/patricmj/HIOFCommuting.git

Conflicts:
	HIOFCommuting/bin/HIOFCommuting.apk
	HIOFCommuting/bin/classes.dex
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/SelectionFragment.class
	HIOFCommuting/bin/resources.ap_