aboutus
Merge branch 'master' of github.com:lxian/mineral_museum

Conflicts:
	app/renderer.js