playing with bootstrap
Merge branch 'master' of github.com:callen6/lady_parts

Conflicts:
	app/assets/stylesheets/boostrap_extensions.css
background image and typography
Pull styling.
Remove HEAD in overrides.
Reserve merge conflicts.