Intermediate
Merge branch 'master' of https://github.com/dwelter/pestpp

Conflicts:
	pest++/pest++/pest++.vcxproj.user
	pest++/pestpp.sdf
	pest++/pestpp.v11.suo