adding add hike form to user page
Merge branch 'master' of github.com:alexcoleman/backcountry

Conflicts:
	public/css/user.css