Date
delete 12
Date
Merge branch 'hello&Date'

Conflicts:
	src/hello.cpp

everything ok