Update README.md
Merge branch 'master' of https://github.com/f/storm into frontend

Conflicts:
	README.md