@ CPP_TESTER initialized
+ README.md
Merge branch 'core'
+ README.md
Merge branch 'core'
@ hpp/teststrap.hpp: some tiny fixes
Merge branch 'core'
@ TestCases/cpp/lineTestCase.hpp
Merge branch 'master' of github.com:dariushha/cpptester into develop

Conflicts:
	README.md
	demo
Merge branch 'master' of github.com:dariushha/cpptester into develop

Conflicts:
	README.md
	demo
	hpp/teststrap.hpp
Merge branch 'develop'
Test project is synced with its remote core repo
Merge branch 'develop'
@ TestCases/cpp/lineTestCase.hpp: some fixes
Merge branch 'master' of github.com:dariushha/cpptester into develop

Conflicts:
	demo
Merge branch 'master' of github.com:dariushha/cpptester into develop

Conflicts:
	demo
Merge branch 'develop'

Conflicts:
	demo