Merge branch 'master' of
https://github.com/heipacker/cplusplusexample.git

Conflicts:
	header/test.h
	src/cplusplusexample.cpp
	src/test.cpp