merged
Merge branch 'master' of https://github.com/smartin015/Jarvis
updated Scott