Added config file, press R to reload config file.
The config file is in Common/ConfigSettings.ini. This file will be
automatically generated based on Common/ConfigSettingsTemplate.ini.
Merge branch 'master' of https://github.com/gotcha84/itsatrap

Conflicts:
	itsatrap/Common/Debug/Common.log
	itsatrap/Common/Debug/Common.write.1.tlog
	itsatrap/Debug/Common.dll
	itsatrap/Debug/Common.exp
	itsatrap/Debug/Common.lib
	itsatrap/Debug/Common.pdb
	itsatrap/Debug/ItsATrapClient.exe
	itsatrap/Debug/ItsATrapClient.pdb
	itsatrap/Debug/ItsATrapServer.pdb
	itsatrap/itsatrap.sdf