Initial commit
demo.txt
+demo
Qi
Merge branch 'A_master'

Conflicts:
	Qi.txt
	README.md