asdf
Revert "asdf"

This reverts commit 6acc23142419854afe59be7fab3e37c0e1860fd0.
Merge origin/master
Shooting Auto and new move arm