tables in tables
remove comments
Merge pull request #51 from erumble/feature/editable-entries

Feature/editable entries
Merge pull request #50 from erumble/feature/neatoTaboes

tables in tables
Merge remote-tracking branch 'upstream/development' into super_merge_test

Conflicts:
	app/assets/javascripts/application.js