Initial commit
Add standard files.
Merge branch 'develop'

Conflicts:
	.gitignore
	README.md