iam lazy
Merge branch 'master' of github.com:Gresic/Gresic.github.io

Conflicts:
	_config.yml
	_layouts/default.html
	_layouts/list.html
	_posts/en/2014-08-31-index.md