hopefully final merge
Merge branch 'master' of https://github.com/bcen707/china-first

Conflicts:
	css/main.css