Adds User model has_many Events model & rspec test
fixes merge conflict for user and user_spec