done by james, is his fault
Merge branch 'mergeGyster'
Merge branch 'master' of https://github.com/jhaslowh/CS426