aaa mod 2
roger mod 2
Merge branch 'master' of https://github.com/gaoshangli/gitskills

# By gaoshangli
# Via gaoshangli
* 'master' of https://github.com/gaoshangli/gitskills:
  add gel

Conflicts:
	aaa.txt