commit
Merge branch 'master' of http://github.com/teze/teze.github.io into source

Conflicts:
	_config.yml
""
Merge branch 'source' of http://github.com/teze/teze.github.io into source