updated ep
Merge branch 'master' of github.com:titse/final-project
worked on stuff
Merge branch 'master' of github.com:titse/final-project