leo- change of contents
changes of pics
Merge remote-tracking branch 'origin/eric' into leogao
Merge remote-tracking branch 'origin/eric' into leogao
Merge branch 'leogao'
Merge branch 'master' of https://github.com/cuhkoil/cuhkoil.github.io into leogao

Conflicts:
	index.html
google map + title updated
Merge branch 'leogao'
Merge branch 'master' into leogao
Merge branch 'leogao'