add tag styling
Merge branch 'master' into tag-css
wrap js in pageloads to work with turbolinks
Merge branch 'master' into turbolink-js-fix

Conflicts:
	app/assets/stylesheets/basic_styling.css
Merge pull request #46 from tarynsauer/turbolink-js-fix

Turbolink js fix