Conflicts:
	app/models/photo.rb

Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb

Added a newline before a list, so that the list can be properly interpreted as a list (Markdown syntax).

This reverts commit 8c0bc4b9.

This reverts commit d55c0ae5.