New layout
Merge branch 'master' of https://github.com/michaellee/michaellee.github.io

Conflicts:
	_layouts/default.html
	index.html