compilation fixes
fixup
makefile fixed
Merge branch 'master' of github.com:adkozlov/cpp-2014

Conflicts:
	homework_02/Makefile
	homework_02/main.cpp
namespace troubles fix