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

Hi Brian,

I don't think we want this branch merged in. I don't understand how it was created. My read of it is that it is the same as some code already checked in.