Switched my files with Dave's because he broke his github

I don't know what is changed. Ask Dave.