Fixing edit reservation form
Merge branch 'master' of github.com:jamesmarkcook/seat_yourself

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