Annotate gem
Merge branch 'master' into users
Added user stuff
Added some more user stuff, need to do password tests and set up encryption
Added salt and password hashing for user class
Merge remote-tracking branch 'origin/users'
Figured out some simple routing
add some divs to layout
simple signup form
Removed authentication controller, add feeds controller
Merge remote-tracking branch 'origin/master' into twitter