Merge branch 'master' of https://github.com/seblucas/cops into seblucas-master

Conflicts:
	.gitignore
	README.md
resolved