change nav color to black
Merge branch 'master' of github.com:blee42/oneday into front-end
working on nav bar
Merge branch 'master' of github.com:blee42/oneday into front-end
picture change
merge front-end