Table.html
Merge branch 'master' of https://github.com/BaconRemovalUnit/CSC210Project

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