added frontend stuff
Merge branch 'master' of https://github.com/maccam912/btc2merchant

Conflicts:
	package.json
Merge branch 'master' of https://github.com/maccam912/btc2merchant