changed error handling in parser
Merge branch 'master' of github.com:mj380/turnt-octo-archer

Conflicts:
	src/error.cc
	src/parser.cc