Merge pull request #3 from ashag/twitter

Twitter
layout
Merge branch 'master' of github.com:ashag/Daves_Pea_Patch

Conflicts:
	config/routes.rb
	spec/factories/user_posts.rb
bootstrap javascript, tabs
adds weather controller, gets info but doesn't render it
Merge pull request #4 from ashag/posts

Posts
weather renders partial in tab
Merge branch 'master' into posts
forecast partial renders at /forecast, root page breaks
Merge pull request #5 from ashag/posts

Posts
fixed merge conflicts