layout
Merge branch 'master' of https://github.com/rrusle/twitter

Conflicts:
	app/assets/stylesheets/twitter.css
	app/controllers/users_controller.rb