From now on, the master branch will combine both implementations. Each language
should use its own branch for development.

Conflicts:
	lisp/banner.txt
	python/__pycache__/client.cpython-34.pyc
	python/__pycache__/define.cpython-34.pyc
	python/__pycache__/interpreter.cpython-32.pyc
	python/__pycache__/interpreter.cpython-34.pyc
	python/__pycache__/parser.cpython-34.pyc
	python/__pycache__/place.cpython-32.pyc
	python/__pycache__/place.cpython-34.pyc
	python/__pycache__/server.cpython-34.pyc
	python/__pycache__/world.cpython-32.pyc
	python/atlantis.py
	python/banner.txt
	python/client.py
	python/define.py
	python/interpreter.py
	python/place.py
	python/server.py
	python/ui.py
	python/world.py
	src/banner.txt