initial commit of testing
fixing unmerged
fix conflicts
Merge branch 'master' of https://github.com/NicholasJay/cardMe into userGroupCards
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)