fixing heroku
added css
conflicts
fixed last_checked_time.txt