sample table with rowspans
Merge branch 'master' of github.com:cthulhu666/easy_table_sample

Conflicts:
	Gemfile
	app/models/person.rb
	app/views/people/index.html.haml
removed public/index.html