beginning refactor
Merge branch 'master' of https://github.com/mcamac/crosswords

Conflicts:
	server.py
begin cleaning up code...