Fix horizantal scrolling
Merge branch 'master' of https://github.com/rdunlop/unicycling-registration

Conflicts:
	app/assets/stylesheets/common/navbar.css.scss

Merge with rdunlop
update README
Merge remote-tracking branch 'scott/master'