add grid.sub for Ashu original
Merge branch 'master' of github.com:jennyshao/bio-project

Conflicts:
	sjrun.py
Merge branch 'master' of github.com:jennyshao/bio-project

Conflicts:
	grid.sub
modified some files