Merge branch 'master' of https://github.com/fparker9676/newSynergy into worldwide
rabbit trail
fix conflicts
Merge pull request #17 from fparker9676/forsys

Forsys
Rad, looks good.
video imbed, text edit, footer build
update
Merge pull request #18 from fparker9676/worldwide

Worldwide
Merge branch 'master' of https://github.com/fparker9676/newSynergy into forsys
navbar update