added gem files
update
initial commit of testing
fixing unmerged
fix conflicts
Merge branch 'master' of https://github.com/NicholasJay/cardMe into userGroupCards
gemfile update
gemfile update
user can view rolodex
User can view rolodex
Merge pull request #7 from tadaya/rolodex

Names of connections showing on rolodex
still working
Merge branch 'userGroupCards' of github.com:sandycjyu/cardMe into sandycjyu-userGroupCards
email test update
merged card controller and user view files (sandy and tai)
Merge branch 'master' of https://github.com/NicholasJay/cardMe into userGroupCards

Conflicts:
	app/controllers/cards_controller.rb
	app/views/cards/index.html.erb
	app/views/users/show.html.erb
Merge branch 'master' of https://github.com/NicholasJay/cardMe into userGroupCards

Conflicts:
	app/controllers/cards_controller.rb
	app/views/cards/index.html.erb
	app/views/users/show.html.erb
update conflicts
flash message for email updated
user story : create  group name  complete