hello1
Merge branch 'master' of https://github.com/pelikenmag/algo

Conflicts:
	palki.cpp