after running a total pruge of repository, I'm ahead.

Merge branch 'master' of http://github.com/JamesWKerr/4thYearProject