tables
Merge branch 'master' of github.com:khcr/resj

Conflicts:
	app/views/pages/home.html.erb