Merge branch 'staging' into dev
Merge branch 'master' into dev
Merge branch 'master' of https://github.com/borisjoffe/bitstarter into staging

Conflicts:
	index.html
Merge branch 'dev' of https://github.com/borisjoffe/bitstarter into dev

Conflicts:
	index.html
changed port
added addthis social buttons and did async load for coinbase script
Merge branch 'dev' into staging

Conflicts:
	index.html
Merge branch 'staging'

Conflicts:
	index.html