UI
Merge branch 'master' of https://github.com/jakedombrower/open_range_dj

Conflicts:
	app/views/pages/index.html.erb
	app/views/reservations/index.html.erb