flash update
Merge branch 'master' of https://github.com/NicholasJay/cardMe into jsimon727-user_can_create_card