comment
Merge branch 'master' of https://github.com/LexHsu/lexhsu.github.com

Conflicts:
	css/default.css