Created regex
Merge branch 'master' into BoardEditor
Added constants
Comitting for backup
Comitting for backup
Fixed merge conflicts
Removed previously inserted test
Committing for backup

Issue 22