add hackathon info
Merge branch 'master' of https://github.com/g0v/g0v.tw

Conflicts:
	app/styles/_less/g0v.less
regen for 3dc3099