comments fun fun
ahhh conflict!
stupid dbml
Merge branch 'master' of https://github.com/cvoorber/NMDH

Conflicts:
	code/App_Code/ndmhDC.dbml.layout
	code/App_Code/ndmhDC.designer.cs