dkassa commit
working credentials
Merge branch 'dkassa'

Conflicts:
	package.json
Merge branch 'ellery44'
badges folder created
badges folder created
Merge branch 'master' of https://github.com/plingampally/BitBadge into carolinehardin
Update BitBadgeClass.json
Update BitBadgeClass.json
Merge pull request #1 from plingampally/carolinehardin

Carolinehardin
Create issueThisBadge.json
Create BitBadgeCriteria.txt
Update issueThisBadge.json
Update issueThisBadge.json
Rename issueThisBadge.json to 1.json
Merge branch 'master' of https://github.com/plingampally/BitBadge

Conflicts:
	modules/badges/BitBadgeClass.json
Update 1.json
Update 1.json
add bitcoin addresses
Merge branch 'master' of https://github.com/plingampally/BitBadge