auto reload routes.rb
Merge branch 'master' of github.com:hage/sample_app

Conflicts:
	spec/spec_helper.rb