Super deleted
Committed Old Super
Hmm
dd
r
Merge branch 'master' of https://github.com/damp/Damp

Conflicts:
	DampServer/DampServer/public/cs.png
	DampServer/DampServer/public/jens.png
	DampServer/Database1/Database1/Database1.sqlproj