added custom time block
merged custom-pick with master
Merge branch 'google'
initial facebook branch
added and committed
changed Token to User model
created droppable function to begin collecting info for event dropped into calendar
redirected google user back to results page after logging in, added column email to users, added user_id to events and associated them after a user logins via google