updated local data
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
we
Merge remote-tracking branch 'upstream/master'

Conflicts:
	coin/index.html
Merge pull request #270 from jpecht/master

merge stuff