testing out mergine
testing git
one more test
testing commit
testing merge and commit
Merge branch 'parserEric' into parser

Conflicts:
	README.md
more testing
Merge branch 'parser' into parserEric

Conflicts:
	README.md