- init
Merge branch 'master' of https://github.com/rubikill/Demo

Conflicts:
	.gitignore
	LICENSE
	README.md