Initial commit
Merge branch 'master' of github.com:StephanHoyer/skeleton

Conflicts:
	.gitignore