changed css link
added nav to flow
Merge branch 'master' of https://github.com/brianlam93/cs147-discoveroute

Conflicts:
	categories.html