fixed serving
Merge branch 'master' of https://github.com/kovach/rfp

Conflicts:
	static/client.js
	web/web.js
test push