Update all files for Ashleyproject submission

[Ashleyht]

Hi Navid and Louis, I would like to submit the final version of all files in my project. (Sorry for the typo in this pull request title, I accidentally hit 'enter' when I tried to type an apostrophe)

[lmoresi]

On time submission, passing through for evaluation