små ændringer
blablah

Conflicts:
	JTM/App_Data/JTM.mdf
	JTM/App_Data/JTM_log.ldf
Merge remote-tracking branch 'origin/master'

Conflicts:
	JTM/App_Data/JTM.mdf
	JTM/App_Data/JTM_log.ldf