Merge branch 'master' of https://github.com/Krill221/RioCard

Conflicts:
	Gemfile
	Gemfile.lock
mm
Merge branch 'master' of https://github.com/Krill221/RioCard

Conflicts:
	Gemfile
	Gemfile.lock