Initial commit
Merge branch 'master' into develop

Conflicts:
	README.md
Merge pull request #1 from PopShack/develop

Develop