PlayNIM finished(?)
Merge branch 'master' of https://github.com/Isacar/Comp-311-Nim

Conflicts:
	NIM/NIM/server_main.cpp
WHYYYYY