Merge branch 'master' of https://github.com/fparker9676/newSynergy into forsys
navbar update
catchup
Merge branch 'master' of https://github.com/fparker9676/newSynergy into forsys
Merge pull request #25 from fparker9676/forsys