git please stop yelling at me
Merge branch 'master' of https://github.com/alexmsimms/bees

Conflicts:
	final_paper/bees.tex