making sure things are good
Merge branch 'master' of https://github.com/MrSkyBear/CS340

I'm not sure why this is happeningi.