test
Merge branch 'master' of github.com:vanatteveldt/luctor

Conflicts:
	README.md