initial
lots of stuff
.gitignore
Merge branch 'master' of github.com:soenkehahn/edith

Conflicts:
	.gitignore