Wrote tests for new regexps
Merge branch 'master' of github.com:artdst/artdst-landing
Resolved merge conflicts and updated regexps