formatted time to go in as UTC and come out as EDT
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/reservations/_form.html.erb