Bhrie hates conflicts.
Merge branch 'master' of github.com:scottdavis99/lsi
fixed conflicts.
Merge branch 'master' of github.com:scottdavis99/lsi
Merge branch 'master' of github.com:scottdavis99/lsi