Insi commit
Merge branch 'master' of github.com:radomirbosak/testrep

Conflicts:
	flower.py