table
Merge branch 'master' of https://github.com/khcr/neurones

Conflicts:
	app/views/tables/_table.html.erb