Moved root route up to the top of the routes file.
Merge branch 'master' into tut-chap5

Conflicts:
	config/routes.rb
Changed new user route to use single quoted string.