Initial commit
Merge remote-tracking branch 'GitHub/master' into develop

Conflicts:
	.gitignore
	README.md
Fixed bad merge