Merge branch 'action'
calibrate
fixed conflicts
Merge branch 'action'
merged
Commit
Merge branch 'master' of https://github.com/HackLightly/HeyJarvis
Merge branch 'action'