Minor rearrangements and spelling
Merge branch 'master' of github.com:joshaw/SoftwareEngineering
Merge branch 'master' of github.com:joshaw/SoftwareEngineering
remove test files
Add gitignore

Ignore temp/backup files
Make changes as discussed in meeting