Merge branch 'master' of https://github.com/ngambino/hinitial

Conflicts:
	main.aux
	main.log
	main.pdf
	main.synctex.gz