Merge branch 'donghe'
Update recommendation.html
Merge remote-tracking branch 'origin/donghe'
merge donghe to master
try again
conflict

Conflicts:
	recommendation.html
kill the conflicts
Merge branch 'master' into donghe