Open sourced
Merge branch 'master' of github.com:LoadingDeck/Billing

Conflicts:
	.gitignore
	README.md