update
Merge branch 'master' of https://github.com/tjwei/tjw_ipynb

Conflicts:
	twrailway.ipynb

update