inget nytt
fungerande databas med basic funktionalitet
Inget nytt
Merge branch 'master' of https://github.com/dinova/Studiekoll

Conflicts:
	Studiekoll/.metadata/.plugins/com.android.ide.eclipse.adt/palette-preview-r16b-19-apptheme-37wvganexusone/TabHost.png
	Studiekoll/.metadata/.plugins/com.android.ide.eclipse.adt/palette-preview-r16b-19-apptheme-37wvganexusone/TabWidget.png
	Studiekoll/.metadata/.plugins/org.eclipse.cdt.core/.log
	Studiekoll/.metadata/.plugins/org.eclipse.core.resources/.projects/Studiekoll/.indexes/a0/d6/history.index
	Studiekoll/.metadata/.plugins/org.eclipse.core.resources/.projects/Studiekoll/.indexes/properties.index
	Studiekoll/.metadata/.plugins/org.eclipse.core.resources/.projects/Studiekoll/.markers
	Studiekoll/.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers
	Studiekoll/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Studiekoll/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	Studiekoll/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	Studiekoll/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Studiekoll/.metadata/.plugins/org.eclipse.jdt.core/567277047.index
	Studiekoll/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Studiekoll/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	Studiekoll/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	Studiekoll/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	Studiekoll/Studiekoll/bin/Studiekoll.apk
	Studiekoll/Studiekoll/bin/resources.ap_
	Studiekoll/Studiekoll/res/layout/fragment_main.xml
mergat DatabaseFunctionality med master