ZI edits
Merge branch 'master' of https://github.com/ivezic/NSF2013

Conflicts:
	education.tex
	introduction.tex