styled tag-it
Merge branch 'master' of github.com:railsrumble/r14-team-373

Conflicts:
	app/assets/stylesheets/base.css.scss
add partial for martin