first commit
initial commit
Merge branch 'master' of https://github.com/blinktrade/blinktrade-merchant-app

Conflicts:
	.gitignore