Almost done
Merge branch 'master' of https://github.com/SeniorProjects-CS-Illinois/documentation