Initial commit
Project initialization
Merge remote-tracking branch 'upstream/master'
Merge branch 'develop'

Conflicts:
	.gitignore
	README.md