fileupl
Merge branch 'develop' of github.com:octoberry/qiwihack into develop

Conflicts:
	server.py
	templates/create.html
	templates/index.html