update to ver.3
Merge remote-tracking branch 'origin/master'

Conflicts:
	learngithub.txt