Initial commit
Merge branch 'master' of https://github.com/i7a/Heidern

Conflicts:
	.gitignore