edits
Merge branch 'master' of https://github.com/mitraraman/15418_final_project