requirements
Merge branch 'master' of https://github.com/btaba/bitcoinHack

Conflicts:
	bitcoinHack/btc/templates/btc/dashboard.html
	bitcoinHack/requirements.txt