modified for real data.
Merge branch 'master' of https://github.com/catch0822/2013F2AT

Conflicts:
	app.js