txt
Merge branch 'master' of github.com:agnar13/Ofurtitle

Conflicts:
	verklega/verklega/App_Data/aspnet-verklega-20140509095841.mdf
	verklega/verklega/App_Data/aspnet-verklega-20140509095841_log.ldf