Main updates
Merge branch 'master' of https://github.com/bcole/SWProjectDay.git
Merge branch 'master' of https://github.com/bcole/SWProjectDay.git