html changes
halfway to getting in real data
introduced real data
fixed legend values
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/main.js
Merge pull request #35 from jpecht/master

introduced real data