Josh's data
Merge branch 'master' of https://github.com/hbrice/cis422project2
pushing to heroku
made try cases to not break code
made try cases to not break code