Changed the tests to HSpec and fixed the parser to accept empty blocks
Merge branch 'master' into develop
Merge pull request #1 from bananu7/develop

First develop merge.
Merge branch 'master' into fancy_printing

Conflicts:
	Test.hs