navbar
fix conflict
Merge pull request #36 from fparker9676/forsys

Forsys
Merge branch 'master' of https://github.com/fparker9676/newSynergy into ampsyn
add request page, modify about page