Merge branch 'master' of https://github.com/CharlesGust/Final-Project in...

...to 53