Merge branch 'master' of https://github.com/Edward1992/edward1992.github.com

Conflicts:
	_includes/themes/twitter/default.html

Changed the theme
switched theme and added duoshuo comment
Merge branch 'master' of https://github.com/Edward1992/edward1992.github.com

Conflicts:
	_includes/themes/the-program/post.html