Changed order of library/include flags in Makefile
Merge branch 'dev' of https://github.com/djrieger/mjplusplus into dev

Conflicts:
	Makefile
Merge branch 'dev' of https://github.com/djrieger/mjplusplus into dev