nested conditionals don't fail anymore, but the gforth output still isn't quite right
Merge branch 'master' of https://github.com/ryanmp/cs480

Conflicts:
	hw5/generator.py
	hw5/parser.py