update home
update home
Merge branch 'master' of https://github.com/zhengweiyu/ash

Conflicts:
	app/views/pages/about.html.erb
	app/views/pages/contact.html.erb
	app/views/pages/faq.html.erb
	app/views/pages/home.html.erb
	app/views/pages/path.html.erb
Merge branch 'master' of https://github.com/zhengweiyu/ash
Merge branch 'master' of https://github.com/zhengweiyu/ash
update system