updata 4-30-2
Merge branch 'master' of https://github.com/jsers/jsers.github.com

Conflicts:
	data/data.md