beakon pin
Merge branch 'master' of https://github.com/kynan/beakon

Conflicts:
	views/receipt.html