merging stash
Merge branch 'temp'

Conflicts:
	output/.DS_Store
	writeup/gaussian/gaussian.aux
	writeup/gaussian/gaussian.log
	writeup/gaussian/gaussian.pdf
	writeup/gaussian/gaussian.synctex.gz
	writeup/gaussian/gaussian.tex
nightly