added db_column tests to event spec
fixed merge comflict in coverage.json
Merge pull request #17 from Cynaria/event_columns_tests

added db_column tests to event spec
Comments test and code
building out views and controllers
fixed merge conflict with json file
Merge pull request #18 from Cynaria/building_sprint_1_views

Building sprint 1 views
fixed conflict errors
Merge pull request #19 from Cynaria/commentable_tests

Commentable tests
added a spec/features folder with commented tests because.
fixing merge conflict in JSON
Merge pull request #20 from Cynaria/misc

Misc
Resolve merge conflict