navbar menu color
changes
merge
merge
trying to fix files
fixed merge?
Merge branch 'master' of https://github.com/harrybui22/Cogs187InfoArchitecture

Conflicts:
	Website/css/bootstrap.min.css
	Website/css/mystyles.css