conflict?
Merge branch 'master' of https://github.com/rocaz/general

Conflicts:
	doc/Untitled.txt