trying mocking
fixing conflicts
Reflection and updates to 7 of the EventCards
Merge branch 'master' of github.com:Ongion/betrayal