Reorganized back to original structure
Merge branch 'master' of https://github.com/baryon5/phs-votes

Conflicts:
	__init__.py
	categoriestest.dat
	client/__init__.py
	client/categoriestest.dat
	client/paramtest.dat
	client/scrolledlistbox.py
	client/testparams.py
	client/vote.py
	client/votingframe.py
	client/votinggui.py
	paramtest.dat
	pythongui/__init__.py
	pythongui/categoriestest.dat
	pythongui/paramtest.dat
	pythongui/scrolledlistbox.py
	pythongui/testparams.py
	pythongui/vote.py
	pythongui/votingframe.py
	pythongui/votinggui.py
	scrolledlistbox.py
	testparams.py
	vote.py
	votingframe.py
	votinggui.py