Create "timeline", add Card For Coin
Merge remote-tracking branch 'origin/master' into django

Conflicts:
	index.css
	index.html