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

Conflicts:
	demo
Merge branch 'develop'

Conflicts:
	demo