README formatting
Merge branch 'master' of github.com:jpeg/CS238-Forum-Website

Conflicts:
	README.md