pulling
Merge branch 'master' of github.com:JoeDailey/cs638-SocialPhotoSite
posting
Merge branch 'master' of github.com:JoeDailey/cs638-SocialPhotoSite

Conflicts:
	server.js
	views/home.ejs