added controllers and models and stuff and other stuff. Not sure the validity
tweaks to landing page
Merge pull request #12 from thesubtlety/breaking-shit

Ok I trust you know what you are doing...
Merge branch 'master' of github.com:blaedj/smweather

Conflicts:
	app/views/static_pages/home.html.erb
Landing page layout
Start user tests
Update waffle.io badge to be https so GitHub does not cache the image.
Merge pull request #13 from waffleio/master

Update waffle.io badge to be https so GitHub does not cache the image.
add sending and recieving of texts, new config file
Merge branch 'master' of github.com:blaedj/smweather
starting to write parsing logic
convert to postgres from sqlite
specify ruby version
add procfile for heroku
move configuration variables to heroku application settings from a custom config file
add error checking when setting twilio vars, remove compass gem
un-remove compass
remove -p command from procfile, may be causing heroku errors
upgrade compass to rails4-supporting alpha
procfile tweak