Changed .rvmrc to .ruby-version and added it to .gitignore
Merge branch 'master' of github.com:sighmon/hackerspace