Merge branch 'master' of https://github.com/EvanAgee/TSpot

Conflicts:
	css/styles.css
Merge branch 'master' of https://github.com/EvanAgee/TSpot