updating conflicts
Merge branch 'master' of https://github.com/cegme/gatordsr
added a line to work with spark streaming