navbar restored side bar deredundified
Merge branch 'master' of github.com:team461WBI/website

Conflicts:
	app/views/layouts/application.html.erb
	app/views/twitter_feed/_sidebar_twitter_feed.html.erb
Merge branch 'master' of github.com:team461WBI/website