working on implementing trade functionality between villagers.
added functionality for purchasing items is complete.
added functionality for selling items is nearly complete.
furthered implementation for the Logger is nearly complete.
added classes for implementation of tasks.
trying to resolve push issue
Merge branch 'master' of https://github.com/mcdonagh/capstone

Conflicts:
	Third Party/mcp744/forge/fml/eclipse/Minecraft/ForgeModLoader-client-0.log
	Third Party/mcp744/forge/fml/eclipse/Minecraft/ForgeModLoader-client-0.log.1
	Third Party/mcp744/forge/fml/eclipse/Minecraft/ForgeModLoader-client-1.log
	Third Party/mcp744/forge/fml/eclipse/Minecraft/ForgeModLoader-client-1.log.1
	Third Party/mcp744/forge/fml/eclipse/Minecraft/ForgeModLoader-client-2.log
	Third Party/mcp744/forge/fml/eclipse/Minecraft/ForgeModLoader-client-2.log.1
	Third Party/mcp744/forge/fml/eclipse/Minecraft/output-client.log
	Third Party/mcp744/forge/fml/eclipse/Minecraft/output-client.log.1
	Third Party/mcp744/forge/fml/eclipse/Minecraft/output-log.IO.txt
	Third Party/mcp744/forge/fml/eclipse/Minecraft/output-server.log