Merge branch 'master' of https://github.com/teazean/teazean.github.io

Conflicts:
	css/main.css
Merge branch 'master' of https://github.com/teazean/teazean.github.io