Merge branch 'ampsyn'
Merge branch 'master' of https://github.com/fparker9676/newSynergy into forsys
navbar update
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
Merge pull request #26 from fparker9676/ampsyn

Ampsyn
fix about page layout
Merge pull request #27 from fparker9676/ampsyn

done
update navbar
fix about button to be home button
Merge pull request #29 from fparker9676/ampsyn

fix about button to be home button
catchup
Merge pull request #30 from fparker9676/forsys
party
Merge branch 'master' of https://github.com/fparker9676/newSynergy into worldwide