replaces placeholder
Merge pull request #4 from amyrjohnson/master

adds seed data
commit before pull
fixes merge conflicts
seeds db
removes require-pry from city.rb
changes migration for pushing to heroku
refactored city model to compare seconds instead of Time objects
fixes sunset query
Merge pull request #5 from amyrjohnson/adjust-time

fixes sunset query
intergrates refactoring of get_sunset_times