Fixed Project
This should work
Merge branch 'master' of http://github.com/JJMcConnell/Software-Engineering-Project