to merge
Merge branch 'master' of https://github.com/gusioo/billme-py

Conflicts:
	rachunki.py
new version