Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	README.md
gitignore
Merge branch 'master' into develop