Fixed regular expression problems
Merge branch 'master' of https://github.com/Snillocydoc/Cs1699-Deliverable3.git
Fixed regular expression problem