Merge github.com:Firsta/CppLearning

Conflicts:
	helloworld.cpp
Merge branch 'master' of github.com:Firsta/CppLearning
added input.cpp