simplified if(x) return true; else return false;
Merge branch 'dev' of github.com:djrieger/mjplusplus into dev

Conflicts:
	parser/parser.cpp