make action
addedapi for creating events
merget tommys stuff
works edit from calendar
tommy removes events from list when updated
added unicorn for heroku
dependencies
fix logged in filter
ignore nb
gemfile
gemfile
removed stuff
revert
Arielgit add .git add .
added column, fixed calendar new event
removed log, csrf for events
fixed current_user thing
Removed shit
Merge remote-tracking branch 'origin/master' into test2

Conflicts:
	app/views/static_pages/home.html.erb