dang
Merge branch 'master' of https://github.com/herohandsomes/MarkUsCode

Conflicts:
	appcompat_v7_12/bin/android-support-v7-appcompat.jar
	vidu2/bin/classes/.gitignore
	vidu2/bin/jarlist.cache