neco
Merge branch 'master' of https://github.com/esvepecko/Polka

Conflicts:
	Polka.cpp