First commit
Merge branch 'master' of git://github.com/benruijl/marietje

Conflicts:
	.gitignore