added rvmrc
Merge branch 'master' of github.com:shutl/shutl_auth

Conflicts:
	Gemfile.lock