coin folder stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	coin/index.html