Trying to fix this menu thangalang
Again, fixing menu. bad at command line...
Merge branch 'master' of https://github.com/ckahle33/CNS_3root

Conflicts:
	CNS_3/css/style.css
	CNS_3/index.php
	CNS_3/js/scripts.js