Brought up to date with lab 5
Rename Project file for submission
Merge branch 'release-lab5'