need changes
Merge branch 'master' of https://github.com/AmandaSutherland/ERRbot
Merge branch 'master' of https://github.com/AmandaSutherland/ERRbot
unsure if there are changes.....
arbiter works