aiming code a little buggy, but works well
Merge branch 'master' of https://github.com/Azmisov/470-group
merge with john