Update readme.
Merge branch 'master' of https://github.com/slider1337/paint-room.git

Conflicts:
	README.md