finished regexes
Merge branch 'master' of github.com:carusocr/upcase
fixed conflicts