Add all
Change directory
Create README.md
Add README.md
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	.project
	bin/Main.class
	bin/Turtle/HTurtle.class
	bin/Turtle/Tensen.class
	bin/Turtle/Turtle.class
	bin/Turtle/TurtleFrame$Line.class
	bin/Turtle/TurtleFrame.class
	bin/adapterpattern/FileIO.class
	bin/adapterpattern/FileProperties.class
	bin/adapterpattern/Inputfuck.class
	bin/bridge/CountDisplay.class
	bin/bridge/Display.class
	bin/bridge/DisplayImp.class
	bin/bridge/StringDisplayImp.class
	bin/factorypattern/Factory.class
	bin/factorypattern/Product.class
	bin/idcard/IDCard.class
	bin/idcard/IDCardFactory.class
	bin/iterator/TestIterator.class
	bin/mediator/Colleague.class
	bin/mediator/ColleagueButton.class
	bin/mediator/ColleagueCheckbox.class
	bin/mediator/ColleagueTextField.class
	bin/mediator/LoginFrame.class
	bin/mediator/Mediator.class
	bin/prototype/Manager.class
	bin/prototype/MessageBox.class
	bin/prototype/Product.class
	bin/prototype/UnderlinePen.class
	bin/prototype/absMessage.class
	bin/state/Context.class
	bin/state/DayState.class
	bin/state/NightState.class
	bin/state/SafeFrame.class
	bin/state/State.class
	bin/strategy/Hand.class
	bin/strategy/Player.class
	bin/strategy/RandomStrategy.class
	bin/strategy/Strategy.class
	bin/strategy/WinningStrategy.class
	bin/templar/ExEncode.class
	bin/templar/Testcode.class
	bin/templar/Unit2.class
	bin/templar/test.class
	bin/templar/testrandom.class
	bin/templar/unit1.class
	bin/templar2/Upload.class
	bin/templar2/test.class
	src/Main.java