Modified nav
Merge branch 'master' of https://github.com/wendycan/yuetai.wendycan.org

Conflicts:
	app/views/layouts/_nav.html.haml
Merge branch 'master' of https://github.com/wendycan/yuetai.wendycan.org

Conflicts:
	db/seeds.rb