committing addition of ng-grid
fixing merge conflict
Merge branch 'master' of http://github.com/tonyvance/estimator
fixing bug in how joins are brought in