add font colour
Merge branch 'master' of https://github.com/peterlee0127/TKU_Hackthon_Server

Conflicts:
	app.js