adding workplace links
Merge branch 'master' into android

Conflicts:
	yiqingsim.tex