RAILS TUTORIAL DONE!!!!!!!!!!!!!!!!!!!!!!
Merge branch 'following-users'

Conflicts:
	app/controllers/static_pages_controller.rb