some local changes
Merge branch 'master' of https://github.com/jugmac00/goat
fixed functional-tests.py