edits
Merge branch 'master' of github.com:balancerockmedia/markets-demo

Conflicts:
	README.md
edits
edits