if(while) {return;}
Merge branch 'ast_integration' of github.com:djrieger/mjplusplus into ast_integration

Conflicts:
	parser/parser.hpp