Merge branch 'master' of github.com:IndigitousGreenTeam/scarfie-card

Conflicts:
	.gitignore