initial commit
Merge branch 'master' of https://github.com/JeremyBreunig/webseite

Conflicts:
	.gitignore