initial commit
Merge branch 'master' of https://github.com/BeStillAsBright/luna

Conflicts:
	README.md
readme shuffling