Merge pull request #14 from willtsay/e7chun

updated controller and views
Removed seeds file, edited rake file to populate DB properly
Merge pull request #15 from willtsay/tommy

Removed seeds file, edited rake file to populate DB properly
Merge pull request #16 from willtsay/e7chun

updated controllers....more view methods added to view.rb
Merge pull request #17 from willtsay/e7chun

updated view.rb methods....changed controller names as well
Fixed the rakefile
Added the remainder of files
Merge pull request #18 from willtsay/tommy

Tommy
Added the auth_token and s_id tokens to the users db
Merge pull request #19 from willtsay/tommy

Added the auth_token and s_id tokens to the users db
updated controller
fixed merge conflict.. prob
Merge pull request #20 from willtsay/will

updated controller
made a small deletion of a comment from the rakefile
Merge branch 'master' of https://github.com/willtsay/console_texter into tommy
Merge pull request #21 from willtsay/tommy

made a small deletion of a comment from the rakefile
Merge branch 'master' of https://github.com/willtsay/console_texter into tommy
Merge pull request #22 from willtsay/tommy

Merge branch 'master' of https://github.com/willtsay/console_texter into...
Merge branch 'master' of https://github.com/willtsay/console_texter into tommy
Fine tuning by group