other work stuff
Merge branch 'master' of https://github.com/ccnokes/Tatonka

Conflicts:
	wordpress/wp-content/themes/tatonka/styles/css/style.css