X init
author
Merge branch 'master' of github.com:larusx/Xproject

Conflicts:
	README.md