Initial commit
Merge branch 'master' of https://github.com/ChristianWeyer/SDDConf2014Demo into After_with_Details

Conflicts:
	.gitignore
	README.md