testing branches
Adding .rvmrc
Added database.yml
Merge pull request #7 from pocketIlmatto/development

Development