Signed-off-by: cobersky <cobersky@hotmail.com>
Signed-off-by: cobersky <cobersky@hotmail.com>
Signed-off-by: cobersky <cobersky@hotmail.com>
Signed-off-by: cobersky <cobersky@hotmail.com>
Merge branch 'master' of https://github.com/cobersky/card-empire.git

Conflicts:
	cardEmpire/data/baseAttributes