L0
l1
Merge branch 'master' of https://github.com/guandi97/asdfGitPlay into lolz
M0
Conflicts:
	README.md
W3
Merge branch 'master' of https://github.com/guandi97/asdfGitPlay
M1