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

fix home button again
Merge branch 'master' of https://github.com/fparker9676/newSynergy into worldwide
do no merge
columns
Merge branch 'master' of https://github.com/fparker9676/newSynergy into forsys
Merge pull request #34 from fparker9676/forsys

YEAH!
main page synergy
Merge pull request #35 from fparker9676/worldwide

Worldwide
committing so I can pull again
Merge branch 'master' of https://github.com/fparker9676/newSynergy into ampsyn

Conflicts:
	synergize.html