unbelievably ugly comments
Merge branch 'master' of github.com:railsrumble/r14-team-373

Conflicts:
	config/routes.rb