Sorcery
Sorcery working
Fixed error with register users, can now use regular login or twitter
tried to fix timeslot validation within event time (julie work)
fixed merge conflicts in models and event controller
Mixed merge
Fixed merge conflicts but left figaro out
added stylesheets and simpleform work
deleted datetimepicker
finally figured out how to work with neat
fixed merge confict in event.rb
fixed merge conflict in application.css
Merge branch 'medium-clone' of https://github.com/abali96/twitter_event_archive into arjunsmedium
fixed database timeout to submit events
Merged
Merge fixed again
Hopefully fixed
fixed
Fixed bug, still weird on restart
PLEASE BE FIXED