first commit
Merge branch 'master' of github.com:ore-public/spend

Conflicts:
	.gitignore