汉字乱码?
Merge branch 'master' of github.com:bamcop/Oxalis

Conflicts:
	README.md