added files for badges
Update README.rdoc
Delete README.md
Update README.rdoc
Update README.rdoc
fix routes
Update README.rdoc
started working on homepage
video background on homepage
video background on homepage
form styling
styling
styling
nested intervals
coaches/rowers role
Merge branch 'associations'

Conflicts:
	app/assets/stylesheets/application.css.scss
Merge branch 'master' of https://github.com/danidewitt/rowingapp
removed vid from assets - too big
removed large video
Merge branch 'associations'