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

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

Conflicts:
	index.html
Merge branch 'dev' into staging

Conflicts:
	index.html
Merge branch 'staging'

Conflicts:
	index.html
added css, js, img folders
added orders page which reads from local pg db