Merge branch 'master' into sandbox
Merge branch 'sandbox' of github.com:eestrada/byu-animation-tools into sandbox