fixed checkins bug
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development
resolved conflicts
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development