none
Merge branch 'master' of https://github.com/tfrichard/ParallCAP

Conflicts:
	src/cgl/imr/samples/parallcap/ivy/a/ParallCAPMain.java
Merge branch 'master' of https://github.com/tfrichard/ParallCAP
version 0.0.2