?
Merge branch 'master' of github.com:shreyshahi/spatialME
Merge branch 'master' of github.com:shreyshahi/spatialME
Merge branch 'master' of github.com:shreyshahi/spatialME
??
resolved conflict