doug was here
fixed conflicts
Merge branch 'master' of github.com:scottdavis99/lsi
reset to head
Merge branch 'master' of github.com:scottdavis99/lsi