cards + test
Merge branch 'master' of https://github.com/emo1914/Proekt-1