delete conflicts
Merge branch 'master' of https://github.com/law826/Neurosynth_SNA

Conflicts:
	Neurosynth_SNA.py