eeww
Merge branch 'master' of https://github.com/nguoianphu/nguoianphu.github.com

Conflicts:
	duck/js/main.js