resolves conflicts
empty space added
Merge branch 'master' of https://github.com/rkunche/Cards1.0
test commit