Merge branch 'develop' of https://github.com/jmmaloney4/diamond into develop
updates
upgraded version
updates to lexer
updates
updates
Merge pull request #6 from jmmaloney4/develop

master