using reuglar expression instead if-else
Merge branch 'master' of https://github.com/novacuous/TOC_HW4