fixes merge conflict
adds basic leap controls, orbitcontrols not working
Merge branch 'feature/Addleap' into develop
fixes merge conflicts
finished merge conflicts
fixed bad merge
cleanup of develop
adds ng-repeat table
Merge pull request #47 from biversen21/develop

adds ng-repeat box and starts refactor of angular