my commit
my commit 2
Merge branch 'master' of https://github.com/Krill221/RioCard into develop

Conflicts:
	README.md