fix
Merge branches 'master' and 'master' of https://github.com/peterlee0127/TKU_Hackthon_Server

Conflicts:
	public/javascripts/fild_table_data.js