first commit, add the new file containing translation into Chinese (simplified). The file is zh_cn.coffee
commit before pull from a forked version
Merge branch 'master' of https://github.com/MQQ/Galaxy-Zoo into test

Conflicts:
	public/locales/zh.json
	deleted:    public/locales/zh_cn.json
update by adding more tranlsation
commit in order to push
merge