styling
Merge branch 'master' of https://github.com/JoshuaDickerson/cs205-Final_Project

Conflicts:
	game_server/Configuration/log.txt
ignoring config