Initial commit
Added a README.md, and changes to .gitignore. These came from creating the GitHub repository.
.gitignore: add .idea/ and *~ to the list of ignored files.
Merge branch 'master' into develop