test2
test2
hotfix
dev
Merge branch 'master' of https://github.com/Krill221/RioCard into develop

Conflicts:
	README.md
Merge branch 'develop' into hotfix

Conflicts:
	README.md
Merge branch 'develop' into hotfix

Conflicts:
	README.md
14 apr 2013
14 apr 2013 2
rails def app
rails def app
rails def app