initial
Merge branch 'master' of https://github.com/jensnicolay/lampion

Conflicts:
	.cache
	.gitignore
	build.sbt