Update whitespace
Merge branch 'master' of https://github.com/mhartl/sample_app_3rd_edition
Merge branch 'master' of https://github.com/mhartl/sample_app_3rd_edition

Conflicts:
	app/models/user.rb
Update to Rails 4.2.0.rc1
Update to Rails 4.2.0.rc1
Update coffee-rails
Merge branch 'following-users'