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

Conflicts:
	MyOutput.R