Adding links in nav bar
Merge branch 'master' of https://github.com/fayedu39/gaopi

Conflicts:
	.gitignore
Updating... Again
Merge branch 'master' of https://github.com/fayedu39/gaopi