Merge branch 'master' into develop
Merge branch 'develop'
fix bugs
fix bugs
fix bugs
Merge branch 'master' into develop
clients enter pass
Merge branch 'develop'
shop order
Merge branch 'master' into develop
Merge branch 'master' of https://github.com/Krill221/RioCard
Merge branch 'master' into develop
readme
readme alt
Merge branch 'develop'

Conflicts:
	README.md