initial commit
Merge branch 'master' of https://github.com/Defuera/cards-app

Conflicts:
	.gitignore