Need to commit to pull
Conflict fixes
WIP
commit to pull
conflict fixes
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14
Hopeful fix for Richard
Hopeful fix for Richard