css fixed
Merge branch 'master' of github.com:es335ab/tecblog

Conflicts:
	style.css