Det
Igen
Hallå
Merge branch 'master' of https://github.com/wisingd/Dajoroli

Conflicts:

	Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Dajoroli/.markers.snap

	Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Dajoroli/.syncinfo.snap

	Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstApp/.markers.snap

	Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstApp/.syncinfo.snap

	Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap

	Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap

	Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7_2/.markers.snap

	Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7_2/.syncinfo.snap

	Workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

	Workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Workspace/.metadata/.plugins/org.eclipse.core.resources/.snap
	Workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Workspace/.metadata/.plugins/org.eclipse.jdt.core/2866552604.index