fix routes
my first git
Merge branch 'master' of git://github.com/kunihiko-t/iee-rails

Conflicts:
	config/routes.rb
modify
fix
fixed
close header
add link