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
test passed user can create a new card
Merge pull request #9 from sandycjyu/userGroupCards

User can create group name
flash update
Merge branch 'master' of https://github.com/NicholasJay/cardMe into jsimon727-user_can_create_card
resolved merge conflicts on users show
merged cards controller