fixed conflict
fixed all tests to run with my project - need to have a project with cards, card properties and 2 users setup
fixed all tests, moved functionality into modules since now there is a lot of it
updated version since after adding modularization
fixed tests and modularized