test to see manuscript changes
Merge branch 'master' of https://github.com/jeffreymei/StellarSpectroscopy

Conflicts:
	tex/ms.tex