Parser Updates

Updated parser to throw error if the 2nd cutter has a period
removed conflicts
Merge pull request #19 from BearInATie/dev

Parser Updates