Commits in ~dayan/cs165-2017-base/dayans-cs165-2017-base:project0_edits