final edit
Merge branch 'master' of https://github.com/ClaudiaYun/Optical_Pumping

Conflicts:
	Optical Pumping.log
	Optical Pumping.pdf
	Optical Pumping.synctex.gz
	Optical Pumping.tex