adding tests for event after name changes
gitignore json
test fixes--fixing merge errors
commented out user_controller_spec to pass tests
Merge pull request #28 from Cynaria/bill_tests_fix

Bill tests fix