Merge branch 'master' of https://github.com/JackHolland/Brains

Conflicts:
	ANN_Paper/Circadian_ANN.aux
	ANN_Paper/Circadian_ANN.pdf
	ANN_Paper/Circadian_ANN.synctex.gz
More paper crap
Merge branch 'master' of https://github.com/JackHolland/Brains

Conflicts:
	ANN_Paper/Circadian_ANN.aux
	ANN_Paper/Circadian_ANN.pdf
	ANN_Paper/Circadian_ANN.synctex.gz
	ANN_Paper/Circadian_ANN.tex