formatting issues with README
Merge branch 'master' of https://github.com/grouplens/FolkSource

Conflicts:
	README.md
final formatting for README (server)