Changed names to follow convention, added to makefile
Merge branch 'master' of https://github.com/sridatta/ee122-proj1