comit first
Merge branch 'master' of https://github.com/radekko/wait

Conflicts:
	fie.txt