updating gemfile
updating gemfile
updated readme
readme update
working on user_can_log_in
first test pass user_can_log_in
merge gemfile
fixing unmerged
restoring gemfile
user can view rolodex test
Mailer Working
Merge pull request #4 from tadaya/rolodex

user can view rolodex test
fix conflicts
worked on some css
css changes
Merge pull request #5 from jsimon727/user_can_log_in

User can log in
Merge branch 'master' of https://github.com/NicholasJay/cardMe into userGroupCards
still working