Moved stuff around
Merge http://github.com/mikepanciera/werewolf

Conflicts:
	src/werewolf.py