Add event time
Add a tag and its color
Merge branch 'master' of github.com:Cobra-Kao/cobra-kao.github.io

Conflicts:
	compass/css/screen.css
	data/data.json
	js/index.js