Conversion from string to card updated
Merge branch 'master' of https://github.com/KriegersLabRats/cardGame