First flattened brains
Merge branch 'master' of github.com:johnros/voodoo

Conflicts:
	AWS
	Manuscript/Voodoo.tex