Jag har lagt in en bakgrundsbild
Jag bytte bakgrund
Test
testpush
testestsetstsetstesetses
JONATHAN

HEJ!
Merge branch 'omOss' of https://github.com/BeerDev/AndroidApp into omOss
Merge branch 'swipe_function'

Conflicts:
	AndroidApp/res/layout/activity_main.xml
Merge branch 'omOss' - deleted fragment_main.xml, no use of it anymore. 

Conflicts:
	AndroidApp/res/layout/fragment_main.xml
Uppdaterad Om-oss sida.
Merge branch 'omOss' - No strings.xml because of misstakenly removed
information in conflictng file

Conflicts:
	AndroidApp/res/layout/omss.xml
	AndroidApp/res/values/strings.xml
Fixed problem after merching the Om-oss branch
Misspelling in infotext.
Merge branch 'omOss' -Solved conflict when fixing misspelling.

Conflicts:
	AndroidApp/res/values/strings.xml
Corrected the duplicates caused by merging
Fixed Android Manifest, missed to update internet permission
Merge branch 'swipe_joakim'
Create .gitignore for appcompat

Create .gitignore for appcompat