All the broken shit is no longer bbroken
Merge branch 'master' of https://github.com/Fchaubard/CS108FinalProject