added render json to events controller
merge
Merge branch 'master' of https://github.com/red-spotted-newts-2014/Im-In into rails_skeleton
fixed associations
change invitee to invitation, add fields to user migration
fixed user migration
added log to gitignore
fixed user associations, added seed file, added view for event show
added json, created attending and created actions, minor fixes
changed events#show to show all invitations instead of only 'ins'.  added devise users to routes
Merge pull request #5 from stellajkimm/rails_skeleton

cleaning up events controller, fixed all models, migrations, associations