got Figaro to work
moved weather methods to a weather module
added other weather methods
fixed conflicts
fix merge
Merge branch 'master' of github.com:kylefdoherty/weather-app
hide gemfile.lock
Merge branch 'master' of github.com:kylefdoherty/weather-app
adding address and geocoder
adding twilio for texting services
gemfile thing
Merge branch 'master' of github.com:kylefdoherty/weather-app
passing to kyle
updated bootstrap asset pipeline and added background
different font
updated todo for tomorrow's plans
started on using clockwork, still need to get working
got clockwork working
added procfile
trying to solve dynos