fjdnf
Merge remote-tracking branch 'origin/master'

Conflicts:
	DoggieDeets/views/layout.jade
Merge branch 'master' of https://github.com/lithiah/Project2

Conflicts:
	DoggieDeets/views/layout.jade