merging
Merge branch 'master' of https://github.com/yzhao2012/PGHackForDiversity

Conflicts:
	NEPTR/index.html