Changed some indentation
Merge branch 'master' into alyssa

Conflicts:
	config/routes.rb