test added
hej
Merge branch 'master' of https://github.com/damp/Damp.git

Conflicts:
	README.md
Merge branch 'master' of https://github.com/damp/Damp

Conflicts:
	README.md