Merge branch 'master' of github.com:NicholasJay/cardMe
work on card design
fixing merge conflict
commented out parts of card design menu, finished card design for 1 particular card
confirm commit for quick changes
fixed merge conflict
merge conflicts stylesheet