Finished basic regex handling
Merge branch 'master' of https://github.com/casplantje/camelbot