Updated reservation and location time comparison methods
Merge branch 'master' of https://github.com/thekreal/seat_yourself

Conflicts:
	app/views/restaurants/show.html.erb