added login, feed page, logout
Merge branch 'master' into tweet_seed

Conflicts:
	app/controllers/twitter_controller.rb
	app/views/login.erb
Merge pull request #15 from euglazer/tweet_seed

added login, feed page, logout