what the fuck is going on!!!!!
what the fuck is going on!!!!!!!!
Merge branch 'develop' of https://github.com/Krill221/RioCard into develop

Conflicts:
	log/development.log