commit
git pull

Merge branch 'master' of https://github.com/GalaxyFutures/NDAPGalaxy

Conflicts:
	MyData.R