new parallel
Merge branch 'master' of https://github.com/suppechasper/gmra-vis

Conflicts:
	build/CMakeFiles/GMRAVis.dir/GMRAVisCmdLine.cpp.o
	build/GMRAVis