Started random shit :P
Merge branch 'master' of https://github.com/afriedman1/mud

Conflicts:
	MUD/src/CmdGod.java
Merge branch 'master' of https://github.com/afriedman1/mud