merged master
changed readme
shitty commit
Revert "shitty commit"

This reverts commit 3571141787c8679fbd54d89cc9e661de1b84075b.
added hello.html
created static-pages controller and setup
a bunch of config stuff as well as new static pages

we've also added some specs for these static pages
added a title helper
chang syntax for key
more tests, and a bunch of static pages, routing, and other crap
deleted gem.lock to potentially fix heroku push issues
updated to rails 3.2.7.rc1 to fix heroku commit issues
made a basic user model with testing
fix regex stuff for email
finish the signup form
added ssl to prod
Finish sign in
finished updating users model
Make gravatars secure. some refactoring
fixed up microposts and added feed in user profile