Merge branch 'master' of github.com:NicholasJay/cardMe
changes
Merge branch 'master' into join_on_invite
work on card design
fixing merge conflict
user can join if not already a member
Merge pull request #35 from jsimon727/join_on_invite

Join on invite
commented out parts of card design menu, finished card design for 1 particular card
confirm commit for quick changes
fixed merge conflict
styling and API fixes
Merge pull request #37 from jsimon727/styling

styling and API fixes
merge conflicts stylesheet