static home
remove temp file
home page 1
home-page
normalize
resolve conflict
Merge remote-tracking branch 'origin/master' into 0925-add-connections

Conflicts:
	Timeboard-web/config/routes.rb
	Timeboard-web/db/schema.rb