Initial Commit
Merge https://github.com/swissfire/WebSite

Conflicts:
	.gitignore
	README.md