Initial commit
Update README.md
Update README.md
Update README.md
Merge branch 'develop'
demo version merged into master

Conflicts:
	.gitignore
	README.md
removed merge issue