modified:   ScarDuck/ScarDuck.cbp
	modified:   ScarDuck/ScarDuck.depend
	modified:   ScarDuck/ScarDuck.layout
	modified:   ScarDuck/bin/Debug/ScarDuck.exe
	modified:   ScarDuck/obj/Debug/1.7.4.fivePokerIsJunko.o
	deleted:    "ScarDuck/\345\210\200\347\226\244\351\270\255\344\271\213\346\225\260\346\215\256\347\273\223\346\236\204\351\235\242\350\257\225\351\242\230.pdf"

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	ScarDuck/1.7.5.sumOfNDice.cpp
	ScarDuck/1.7.6.arrangeArray2SmallestNum.cpp
	ScarDuck/1.7.7.minNumInRotateArray.cpp
	ScarDuck/1.7.8.permutationsOfSring.cpp
	ScarDuck/obj/Debug/1.7.5.sumOfNDice.o
	ScarDuck/obj/Debug/1.7.6.arrangeArray2SmallestNum.o
	ScarDuck/obj/Debug/1.7.7.minNumInRotateArray.o
Merge branch 'master' of github.com:nciaebupt/algorithm

Conflicts:
	ScarDuck/ScarDuck.cbp
	ScarDuck/ScarDuck.layout
	ScarDuck/bin/Debug/ScarDuck.exe

	modified:   ScarDuck/1.7.1.uglyNumber.cpp
	new file:   ScarDuck/1.7.2.printOne2MaxOfN.cpp
	modified:   ScarDuck/ScarDuck.cbp
	modified:   ScarDuck/ScarDuck.depend
	modified:   ScarDuck/ScarDuck.layout
	modified:   ScarDuck/obj/Debug/1.7.1.uglyNumber.o
	new file:   ScarDuck/obj/Debug/1.7.2.printOne2MaxOfN.o