several includes into the parser. closed a while loop.
Merge branch 'ast_integration' of github.com:djrieger/mjplusplus into ast_integration

Conflicts:
	parser/parser.hpp