forgot to commit some stuff
Merge branch 'master' of https://github.com/lindseyemaddox/tnrmt

Conflicts:
	_styles/master.css