Merge branch 'master' of github.com:vassilis/vassilis.github.com

Conflicts:
	_layouts/default.html
	index.html
Merge branch 'master' of github.com:vassilis/vassilis.github.com