test
Merge branch 'dev' of https://github.com/bys-galen-zhang/leanrn into dev

Conflicts:
	test.txt