testing merge conflict
Merge branch 'master' of https://github.com/bcen707/china-first
Conflicts:
	js/app.js