Merge branch 'ampsyn'
navbar
Merge branch 'master' of https://github.com/fparker9676/newSynergy into forsys
Merge pull request #21 from fparker9676/forsys
Merge pull request #19 from fparker9676/ampsyn
navbar update
clean up
Merge pull request #24 from fparker9676/worldwide
catchup
Merge branch 'master' of https://github.com/fparker9676/newSynergy into forsys
Merge pull request #25 from fparker9676/forsys
commit in order to pull?
Merge branch 'master' of https://github.com/AMPotter/newSynergy into ampsyn
Merge branch 'master' of https://github.com/fparker9676/newSynergy into ampsyn