Added lasso tool
Merge branch 'refactor' of https://github.com/circlingthesun/Masters into refactor
Fix merge