i added my name
Merge branch 'master' of https://github.com/balissar/science-wustl into balissar-master

Conflicts:
	geometry.txt