Merge branch 'ampsyn'
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