Konstig test kommentar
Adding major files to project for swipefunction
Merge branch 'swipe_function'

Conflicts:
	AndroidApp/res/layout/activity_main.xml