cout dev
master add cout
Merge branch 'dev'

Conflicts:
	test.cpp