cache bust css file
tabs to spaces :space_invader:
Merge branch 'master' into dev

Conflicts:
	css/style.css
Merge pull request #1 from bshackelford/dev

cache bust css file; tabs to spaces