Comment.
Better format, fix while.
Merge branch 'master' of github.com:trbecker/comp-2014-1

Conflicts:
	parser.y