before merging
Merge branch 'master' of https://github.com/xumiao/pymonk

Conflicts:
	.gitignore
remove pyc
Add in some testers