move web server into dir
Merge branch 'master' of https://github.com/door2k/coolness

Conflicts:
	web_server/.idea/.name
	web_server/.idea/coolness.iml
	web_server/.idea/encodings.xml
	web_server/.idea/misc.xml
	web_server/.idea/modules.xml
	web_server/.idea/vcs.xml
	web_server/logging.conf
	web_server/web_server.py