updated gitignore to exclude ruby-version for rvm
Merge branch 'master' of https://github.com/ariabov/letspair
added spec for users_controller. added factorygirl for user
fixed merge issues on gitignore