Tweaking custom css
Merge branch 'master' of https://github.com/stanjw4/fantasy_app

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/teams/show.html.erb