Merge pull request #13 from enspencer/master

about page as partial
Commit before pull.
Resolve merge conflict in bootstrap extensions.
Merge branch 'master' of github.com:callen6/lady_parts

Conflicts:
	app/assets/stylesheets/boostrap_extensions.css