Merge branch 'master' of github.com:NicholasJay/cardMe
merge fix
last commit
Merge branch 'master' of github.com:NicholasJay/cardMe
fixed flipping for invitation, fixed amount of pic uploads, fixed cursor for delete group
quick conflict fix
turned the card around
another quick fix
changes
Merge branch 'dmitryjum-master'
merge conflicts