Commiting to merge
Merge branch 'master' of github.com:sdrhoads/AwesomeNextSteps
Merge branch 'master' of github.com:sdrhoads/AwesomeNextSteps
merging
fixed merge conflict
Implementing regular expressions