styling updates
Merge branch 'master' of https://github.com/mmespn/towelalerts

Conflicts:
	css/main.css
css syntax error fix; uncommenting ad timeout