12
Merge branch 'master' of https://github.com/holingx/Xmobileguard

Conflicts:
	demo.txt