...
...
Merge branch 'master' of github.com:AcademiaSinicaNLPLab/feelit
Merge branch 'master' of github.com:AcademiaSinicaNLPLab/feelit

Conflicts:
	static/js/main.js