Random
Merge branch 'master' of https://github.com/martis347/RobotsAtWar

Conflicts:
	RobotsAtWar/bin/Debug/RobotsAtWar.exe
	RobotsAtWar/bin/Debug/RobotsAtWar.pdb
	RobotsAtWar/obj/Debug/RobotsAtWar.csprojResolveAssemblyReference.cache
	RobotsAtWar/obj/Debug/RobotsAtWar.exe
	RobotsAtWar/obj/Debug/RobotsAtWar.pdb
Text
Merge branch 'master' of https://github.com/martis347/RobotsAtWar

Conflicts:
	RobotsAtWar/Infrastructure.cs
	RobotsAtWar/bin/Debug/RobotsAtWar.exe
	RobotsAtWar/bin/Debug/RobotsAtWar.pdb
	RobotsAtWar/obj/Debug/RobotsAtWar.csprojResolveAssemblyReference.cache
	RobotsAtWar/obj/Debug/RobotsAtWar.exe
	RobotsAtWar/obj/Debug/RobotsAtWar.pdb
Merge branch 'master' of https://github.com/martis347/RobotsAtWar
Added Attack, Attacking, GetAttacked, Defend
Merge branch 'master' of https://github.com/martis347/RobotsAtWar

Conflicts:
	Business/Warrior.cs
Merged
Added methods logging
Starting Testing
none
Finished off methods
Added Tests
Fixed negative time,damage input
Done?
Merged but, not all tests successful
Finished merging, all working for now.
Finished off