add um
Merge branch 'master' of https://github.com/mujinlu/mujinlu.github.com

Conflicts:
	um/css/style.css
	um/index.html
	um/js/showpic.js
Merge branch 'master' of https://github.com/mujinlu/mujinlu.github.com
20131001