rr
Merge branch 'master' of https://github.com/popotans/CommonClass

Conflicts:
	CommonClass.suo
123