Merge branch 'master' of https://github.com/JEMMtastic/CapstoneCharity

Conflicts:
	Capstone/Capstone.v11.suo
Merge branch 'master' of https://github.com/JEMMtastic/CapstoneCharity