added favicon
moved links

Conflicts:
	app/templates/index.html