deleted:    ScarDuck/bin/Debug/ScarDuck
	deleted:    ScarDuck/obj/Debug/1.4.1.BTreePreOrder.o
	deleted:    ScarDuck/obj/Debug/1.6.7.finalClassInCpp.o
	deleted:    ScarDuck/obj/Debug/1.6.9.twoNotRepeatedNumInArr.o
	deleted:    ScarDuck/obj/Debug/1.BSTree2List.o
	deleted:    ScarDuck/obj/Debug/10.MaxLenInBTree.o
	deleted:    ScarDuck/obj/Debug/3.StackWithMin.o
	deleted:    ScarDuck/obj/Debug/4.MaxSumInSubArray.o
	deleted:    ScarDuck/obj/Debug/5.SumOfPathInBSTree.o
	deleted:    ScarDuck/obj/Debug/7.ReverseSentence.o
	deleted:    ScarDuck/obj/Debug/8.verifySquenceOfBSTree.o
	deleted:    ScarDuck/obj/Debug/BSTree2List.o
	deleted:    ScarDuck/obj/Debug/StackWithMin.o
	deleted:    ScarDuck/obj/Debug/test.o
	deleted:    ScarDuck/test.cpp
Merge branch 'master' of github.com:nciaebupt/algorithm
	new file:   ScarDuck/1.13.1.splitSet2TwoEqualSet.cpp
	modified:   ScarDuck/ScarDuck.cbp
	modified:   ScarDuck/ScarDuck.depend
	modified:   ScarDuck/ScarDuck.layout
	modified:   ScarDuck/obj/Debug/1.12.11.strstrAndStrncmp.o
Merge branch 'master' of github.com:nciaebupt/algorithm

Conflicts:
	ScarDuck/1.13.1.splitSet2TwoEqualSet.cpp
	ScarDuck/ScarDuck.cbp
	ScarDuck/ScarDuck.depend
	ScarDuck/ScarDuck.layout
	ScarDuck/obj/Debug/1.12.11.strstrAndStrncmp.o
	new file:   ScarDuck/1.14.1.bubbleSort.cpp
	new file:   ScarDuck/1.3.10.algorithmDesign.cpp
	modified:   InterviewCollection/008 nBrackets.cpp
	modified:   InterviewCollection/InterviewCollection.cbp
	modified:   InterviewCollection/InterviewCollection.depend
	modified:   InterviewCollection/bin/Debug/InterviewCollection.exe
	new file:   InterviewCollection/google-editDistance.cpp
	new file:   InterviewCollection/google-prime.cpp
	new file:   InterviewCollection/google-swapSort.cpp
	modified:   InterviewCollection/obj/Debug/008 nBrackets.o
	new file:   InterviewCollection/obj/Debug/google-editDistance.o
	new file:   InterviewCollection/obj/Debug/google-prime.o
	new file:   InterviewCollection/obj/Debug/google-swapSort.o
	modified:   ScarDuck/1.13.1.splitSet2TwoEqualSet.cpp
	modified:   ScarDuck/1.14.1.bubbleSort.cpp
	new file:   ScarDuck/1.14.2.selectSort.cpp
	new file:   ScarDuck/1.14.3.insertSort.cpp
	new file:   ScarDuck/1.14.4.shellSort.cpp
	new file:   ScarDuck/1.14.5.quickSort.cpp
	new file:   ScarDuck/1.14.6.mergeSort.cpp
	new file:   ScarDuck/1.14.7.heapSort.cpp
	new file:   ScarDuck/1.14.8.sortCompare.cpp
	new file:   ScarDuck/1.15.1.circleInGraph.cpp
	new file:   ScarDuck/1.15.2.primesDecomposition.cpp
	new file:   ScarDuck/1.15.3.gcdAndLcm.cpp
	new file:   ScarDuck/1.16.1.ApplicationContext.cpp
	new file:   ScarDuck/1.16.2.ApplicationContext-event.cpp
	new file:   ScarDuck/1.16.3.mysql_engine.cpp
	new file:   ScarDuck/1.16.4.mysql_index.cpp
	new file:   ScarDuck/1.16.6.mysql_query.cpp
	new file:   ScarDuck/1.17.1.twoOrderQueue.cpp
	new file:   ScarDuck/1.17.2.venom.cpp
	new file:   ScarDuck/1.17.3.bronGirl.cpp
	new file:   ScarDuck/1.17.4.gold.cpp
	new file:   ScarDuck/1.17.5.pirate.cpp
	new file:   ScarDuck/1.17.6.1024Factorial.cpp
	new file:   ScarDuck/1.17.7.coins.cpp
	new file:   ScarDuck/1.17.8.stonesCombine.cpp
	new file:   ScarDuck/1.18.1.producerAndConsumer.cpp
	new file:   ScarDuck/1.18.2.dp.cpp
	new file:   ScarDuck/1.18.3.01bag.cpp
	new file:   ScarDuck/1.18.4.greedy.cpp
	new file:   ScarDuck/1.18.5.packing.cpp
	new file:   ScarDuck/1.19.1.bigdata.cpp
	modified:   ScarDuck/ScarDuck.cbp
	modified:   ScarDuck/ScarDuck.depend
	modified:   ScarDuck/ScarDuck.layout
	new file:   ScarDuck/bin/Debug/ScarDuck.exe
	new file:   ScarDuck/dp.cpp
	new file:   ScarDuck/obj/Debug/1.13.1.splitSet2TwoEqualSet.o
	new file:   ScarDuck/obj/Debug/1.13.10.algorithmDesign.o
	new file:   ScarDuck/obj/Debug/1.13.2.topK.o
	new file:   ScarDuck/obj/Debug/1.13.3.javaCollection.o
	new file:   ScarDuck/obj/Debug/1.13.4.printMatrixClockwisely.o
	new file:   ScarDuck/obj/Debug/1.13.5.allSubsetInSet.o
	new file:   ScarDuck/obj/Debug/1.13.6.exchangeOddAndEvenBits.o
	new file:   ScarDuck/obj/Debug/1.13.7.binarySearch.o
	new file:   ScarDuck/obj/Debug/1.13.8.setMerge.o
	new file:   ScarDuck/obj/Debug/1.13.9.subsetAndCombination.o
	new file:   ScarDuck/obj/Debug/1.14.1.bubbleSort.o
	new file:   ScarDuck/obj/Debug/1.14.2.selectSort.o
	new file:   ScarDuck/obj/Debug/1.14.3.insertSort.o
	new file:   ScarDuck/obj/Debug/1.14.4.shellSort.o
	new file:   ScarDuck/obj/Debug/1.14.5.quickSort.o
	new file:   ScarDuck/obj/Debug/1.14.6.mergeSort.o
	new file:   ScarDuck/obj/Debug/1.14.7.heapSort.o
	new file:   ScarDuck/obj/Debug/1.14.8.sortCompare.o
	new file:   ScarDuck/obj/Debug/1.15.1.circleInGraph.o
	new file:   ScarDuck/obj/Debug/1.15.2.primesDecomposition.o
	new file:   ScarDuck/obj/Debug/1.15.3.gcdAndLcm.o
	new file:   ScarDuck/obj/Debug/1.16.1.ApplicationContext.o
	new file:   ScarDuck/obj/Debug/1.16.2.ApplicationContext-event.o
	new file:   ScarDuck/obj/Debug/1.16.3.mysql_engine.o
	new file:   ScarDuck/obj/Debug/1.16.4.mysql_index.o
	new file:   ScarDuck/obj/Debug/1.16.6.mysql_query.o
	new file:   ScarDuck/obj/Debug/1.17.1.twoOrderQueue.o
	new file:   ScarDuck/obj/Debug/1.17.2.venom.o
	new file:   ScarDuck/obj/Debug/1.17.3.bronGirl.o
	new file:   ScarDuck/obj/Debug/1.17.4.gold.o
	new file:   ScarDuck/obj/Debug/1.17.5.pirate.o
	new file:   ScarDuck/obj/Debug/1.17.6.1024Factorial.o
	new file:   ScarDuck/obj/Debug/1.17.7.coins.o
	new file:   ScarDuck/obj/Debug/1.17.8.stonesCombine.o
	new file:   ScarDuck/obj/Debug/1.18.1.producerAndConsumer.o
	new file:   ScarDuck/obj/Debug/1.18.2.dp.o
	new file:   ScarDuck/obj/Debug/1.18.3.01bag.o
	new file:   ScarDuck/obj/Debug/1.18.4.greedy.o
	new file:   ScarDuck/obj/Debug/1.18.5.packing.o
	new file:   ScarDuck/obj/Debug/1.19.1.bigdata.o
	new file:   ScarDuck/obj/Debug/1.2.1.BSTree2List.o
	new file:   ScarDuck/obj/Debug/1.2.10.MaxLenInBTree.o
	new file:   ScarDuck/obj/Debug/1.2.3.StackWithMin.o
	new file:   ScarDuck/obj/Debug/1.2.4.MaxSumInSubArray.o
	new file:   ScarDuck/obj/Debug/1.2.5.SumOfPathInBSTree.o
	new file:   ScarDuck/obj/Debug/1.2.7.ReverseSentence.o
	new file:   ScarDuck/obj/Debug/1.2.8.verifySquenceOfBSTree.o
	new file:   ScarDuck/obj/Debug/1.3.1 1+2+...+n.o
	new file:   ScarDuck/obj/Debug/1.3.10.algorithmDesign.o
	new file:   ScarDuck/obj/Debug/1.3.2 findKthNodeFromTail.o
	new file:   ScarDuck/obj/Debug/1.3.3.sumOfTwoNum.o
	new file:   ScarDuck/obj/Debug/1.3.4.convertBSTree2Mirror.o
	new file:   ScarDuck/obj/Debug/1.3.5.visitByLevelBSTree.o
	new file:   ScarDuck/obj/Debug/1.3.6. findOnlyOnceChar.o
	new file:   ScarDuck/obj/Debug/1.3.7.lastNumInCircle.o
	new file:   ScarDuck/obj/Debug/1.3.8.Fibonacci.o
	new file:   ScarDuck/obj/Debug/1.3.8.Fibonacci11.o
	new file:   ScarDuck/obj/Debug/1.3.9.FindNumberInLeftShiftSequence.o
	new file:   ScarDuck/obj/Debug/1.4.1.BSTreePreOrder.o
	new file:   ScarDuck/obj/Debug/1.4.10.numOfOneInBinary.o
	new file:   ScarDuck/obj/Debug/1.4.2.listMerge.o
	new file:   ScarDuck/obj/Debug/1.4.3.nStringOfMplusOneLength.o
	new file:   ScarDuck/obj/Debug/1.4.4.nTroopCompete.o
	new file:   ScarDuck/obj/Debug/1.4.5.max2DSubMatrix.o
	new file:   ScarDuck/obj/Debug/1.4.6.powerfulHarmoniousSystem.o
	new file:   ScarDuck/obj/Debug/1.4.7.minSquenceFromAandB.o
	new file:   ScarDuck/obj/Debug/1.4.8.numOf1InDecimal.o
	new file:   ScarDuck/obj/Debug/1.4.9.squenceOfStackPushPop.o
	new file:   ScarDuck/obj/Debug/1.5.1.jumpStairs.o
	new file:   ScarDuck/obj/Debug/1.5.10.nIntSquenceSumN.o
	new file:   ScarDuck/obj/Debug/1.5.2.stringLeftRotation.o
	new file:   ScarDuck/obj/Debug/1.5.3.findMaxNumString.o
	new file:   ScarDuck/obj/Debug/1.5.4.listManipulation.o
	new file:   ScarDuck/obj/Debug/1.5.5.fourRedCardsAndFourBlueCards.o
	new file:   ScarDuck/obj/Debug/1.5.6.combineOfNEqualM.o
	new file:   ScarDuck/obj/Debug/1.5.7.convertString2Int.o
	new file:   ScarDuck/obj/Debug/1.5.8.lis.o
	new file:   ScarDuck/obj/Debug/1.5.9.nBrackets.o
	new file:   ScarDuck/obj/Debug/1.6.1.btreeDepth.o
	new file:   ScarDuck/obj/Debug/1.6.10.delCharInString.o
	new file:   ScarDuck/obj/Debug/1.6.2.fullPermutationsOfString.o
	new file:   ScarDuck/obj/Debug/1.6.3.partitionByOddAndEven.o
	new file:   ScarDuck/obj/Debug/1.6.4.deleteListNodeInO1.o
	new file:   ScarDuck/obj/Debug/1.6.5.reversePrintListNode.o
	new file:   ScarDuck/obj/Debug/1.6.6.finalClassInCpp.o
	new file:   ScarDuck/obj/Debug/1.6.8.twoNotRepeatedNumInArr.o
	new file:   ScarDuck/obj/Debug/1.6.9.commonNodeInTwoList.o
	new file:   ScarDuck/obj/Debug/1.7.1.uglyNumber.o
	new file:   ScarDuck/obj/Debug/1.7.10.powerLogn.o
	new file:   ScarDuck/obj/Debug/1.7.2.printOne2MaxOfN.o
	new file:   ScarDuck/obj/Debug/1.7.3.reversePrintStack.o
	new file:   ScarDuck/obj/Debug/1.7.4.fivePokerIsJunko.o
	new file:   ScarDuck/obj/Debug/1.7.5.sumOfNDice.o
	new file:   ScarDuck/obj/Debug/1.7.6.arrangeArray2SmallestNum.o
	new file:   ScarDuck/obj/Debug/1.7.7.minNumInRotateArray.o
	new file:   ScarDuck/obj/Debug/1.7.8.permutationsOfSring.o
	new file:   ScarDuck/obj/Debug/1.7.9.power.o
	new file:   ScarDuck/obj/Debug/1.8.1.longestPalindrome.o
	new file:   ScarDuck/obj/Debug/1.8.10.urlsize.o
	new file:   ScarDuck/obj/Debug/1.8.2.numGreaterThanHalf.o
	new file:   ScarDuck/obj/Debug/1.8.3.lowestParentOfTwoNode.o
	new file:   ScarDuck/obj/Debug/1.8.4.complexList.o
	new file:   ScarDuck/obj/Debug/1.8.5.aboutList.o
	new file:   ScarDuck/obj/Debug/1.8.6.arrayCompareList.o
	new file:   ScarDuck/obj/Debug/1.8.7.strstr.o
	new file:   ScarDuck/obj/Debug/1.8.8.numLeftSmallRightGreat.o
	new file:   ScarDuck/obj/Debug/1.8.9.reverseStringPair.o
	new file:   ScarDuck/obj/Debug/1.9.1.partitionArrayByOdd.o
	new file:   ScarDuck/obj/Debug/1.9.10.listReverse.o
	new file:   ScarDuck/obj/Debug/1.9.2.memmove.o
	new file:   ScarDuck/obj/Debug/1.9.3.randomGenerator.o
	new file:   ScarDuck/obj/Debug/1.9.4.searchQuery.o
	new file:   ScarDuck/obj/Debug/1.9.5.substrCntInStr.o
	new file:   ScarDuck/obj/Debug/1.9.6.array2tree.o
	new file:   ScarDuck/obj/Debug/1.9.7.bigIntMultiple.o
	new file:   ScarDuck/obj/Debug/1.9.8.continuousIncreaseNumStr.o
	new file:   ScarDuck/obj/Debug/1.9.9.moveStar2Front.o
	new file:   ScarDuck/obj/Debug/dp.o
	new file:   ScarDuck/obj/Debug/test.o
	new file:   ScarDuck/test.cpp
	new file:   googleCodeJam/1.storeCredit.cpp
	new file:   googleCodeJam/2.reverse.cpp
	new file:   googleCodeJam/A-small-practice.in
	new file:   googleCodeJam/B-large-practice.in
	new file:   googleCodeJam/B-large-practice.out
	new file:   googleCodeJam/B-small-practice.in
	new file:   googleCodeJam/B-small-practice.out
	new file:   googleCodeJam/bin/Debug/googleCodeJam.exe
	new file:   googleCodeJam/googleCodeJam.cbp
	new file:   googleCodeJam/googleCodeJam.depend
	new file:   googleCodeJam/googleCodeJam.layout
	new file:   googleCodeJam/obj/Debug/1.storeCredit.o
	new file:   googleCodeJam/obj/Debug/2.reverse.o
	new file:   test/bin/Debug/test.exe
	new file:   test/main.cpp
	new file:   test/obj/Debug/main.o
	new file:   test/test.cbp
	new file:   test/test.depend
	new file:   test/test.layout