Initial commit
Merge branch 'master' into develop, aligning .gitignore and README.md

Conflicts:
	.gitignore