initial parse descriptions and test cases
Merge branch 'master' into parse-descriptions

Conflicts:
	src/test/scala/code/ParserSpec.scala
Merge pull request #8 from achen34/parse-descriptions

initial parse descriptions and test cases