Merge branch 'master' of https://github.com/fparker9676/newSynergy into worldwide
Merge pull request #14 from fparker9676/master

Catching up
rabbit trail
fix conflicts
update navbar txtselect
Merge pull request #15 from fparker9676/forsys

update navbar txtselect

good
Merge pull request #16 from fparker9676/worldwide

Merge pull request #14 from fparker9676/master
update nav login
Merge branch 'master' of https://github.com/fparker9676/newSynergy into forsys
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
clean up
Merge pull request #20 from fparker9676/worldwide
Merge branch 'master' of https://github.com/fparker9676/newSynergy into ampsyn

Conflicts:
	about.html
	modules.css