The Manifest!
Merge remote-tracking branch 'origin/master'

Conflicts:
	DoggieDeets/views/layout.jade