xshanj2 C2
OK
Merge branch 'master' of https://github.com/xshanj2/devamp

Conflicts:
	fix.html