Re-commit correct branch

Hi Jonny,

One of the classmate who chose to do my project pointed out I had some syntax error in my old commit which made me realize that I had pushed the wrong branch up when I made my last pull request. I re-commited my master branch (which only have about 10 lines of syntax changes) in all the source files. Hopefully this isn't too much trouble for you.