Update README.md
Merge branch 'master' of github.com:dirk/hipster

Conflicts:
	README.md