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/bin/Debug/ScarDuck.exe
	modified:   ScarDuck/obj/Debug/1.7.1.uglyNumber.o
	new file:   ScarDuck/obj/Debug/1.7.2.printOne2MaxOfN.o
Merge branch 'master' of github.com:nciaebupt/algorithm

Conflicts:
	ScarDuck/1.7.1.uglyNumber.cpp
	ScarDuck/ScarDuck.cbp
	ScarDuck/ScarDuck.depend
	ScarDuck/ScarDuck.layout
	ScarDuck/bin/Debug/ScarDuck.exe
	ScarDuck/obj/Debug/1.7.1.uglyNumber.o

	modified:   ScarDuck/1.7.1.uglyNumber.cpp
	new file:   ScarDuck/1.7.3.reversePrintStack.cpp
	new file:   ScarDuck/1.7.4.fivePokerIsJunko.cpp
	modified:   ScarDuck/ScarDuck.cbp
	modified:   ScarDuck/ScarDuck.depend
	modified:   ScarDuck/ScarDuck.layout
	new file:   ScarDuck/obj/Debug/1.7.3.reversePrintStack.o
	new file:   ScarDuck/obj/Debug/1.7.4.fivePokerIsJunko.o
	new file:   ScarDuck/scarDuck.pdf