jpeg update
Merge branch 'master' of https://github.com/Ejbert/ejbert.github.io

Conflicts:
taipei.JPeG
Merge branch 'master' of https://github.com/Ejbert/ejbert.github.io

Conflicts:
	taipei.JPeG