Admin stuff
Merge branch 'master' of https://github.com/Fchaubard/CS108FinalProject