Remove merge conflict remnant from readme
Added REGEXP and NOT REGEXP operators
Added REGEXP function
Merge branch 'master' of github.com:cnelissen/DoctrineExtensions

Conflicts:
	lib/DoctrineExtensions/Query/Mysql/Regexp.php
Merge pull request #120 from cnelissen/master

REGEXP Function
Merge pull request #118 from terite/patch-1

Remove merge conflict remnant from readme
Sync
Merge remote-tracking branch 'upstream/master'