Merge branch 'master' into development
Filled in the README.md file with some details on setting up your local environment.
Merge branch 'development'