Lin
Merge branch 'master' into T11_Lin_add_info
edited my name
Conflicts:
	README.md
Merge branch 'master' into T11_Lin_add_info
resolving conflict
Conflicts:
	README.md
fixed conflict
Further conflicts.
Merge pull request #23 from alaashafaee/T11_Lin_add_info

Lin