updated server logic
Merge branch 'master' of https://github.com/EthanSoch/CSC324-Team-1.git

Conflicts:
	rookwithfriends/war/index.html