updates
!!!styles.css still has a conflict!!!
Merge branch 'master' of github.com:EvanAgee/TSpot

Conflicts:
	css/styles.css