first commit
Use GitHub's suggested .gitignore
Merge branch 'patch-1' of https://github.com/Scotchester/project-template into Scotchester-patch-1

Conflicts:
	.gitignore
	README.md