update
Merge branch 'master' of https://github.com/dougc333/c--

Conflicts:
	cs106b/Assignment1-linux/0-Warmup/StanfordCPPLib/libStanfordCPPLib.a
	cs106b/Assignment1-linux/0-Warmup/Warmup.cpp
	cs106b/Assignment1-linux/1-ConsecutiveHeads/ConsecutiveHeads
	cs106b/Assignment1-linux/1-ConsecutiveHeads/ConsecutiveHeads.cpp
	cs106b/Assignment1-linux/1-ConsecutiveHeads/ConsecutiveHeads.o
	cs106b/Assignment1-linux/1-ConsecutiveHeads/StanfordCPPLib/libStanfordCPPLib.a
	cs106b/Assignment1-linux/2-Obenglobish/Obenglobish
	cs106b/Assignment1-linux/2-Obenglobish/Obenglobish.cpp
	cs106b/Assignment1-linux/2-Obenglobish/Obenglobish.cpp~
	cs106b/Assignment1-linux/2-Obenglobish/Obenglobish.o
	cs106b/Assignment1-linux/2-Obenglobish/StanfordCPPLib/libStanfordCPPLib.a
	cs106b/Assignment1-linux/3-Combinations/Combinations.cpp
	cs106b/Assignment1-linux/4-NumericConversion/NumericConversion
	cs106b/Assignment1-linux/4-NumericConversion/NumericConversion.cpp
	cs106b/Assignment1-linux/4-NumericConversion/NumericConversion.cpp~
	cs106b/Assignment1-linux/4-NumericConversion/NumericConversion.o
	cs106b/Assignment1-linux/4-NumericConversion/StanfordCPPLib/libStanfordCPPLib.a
	cs106b/Assignment2-linux/StanfordCPPLib/platform.cpp
	cs106b/Assignment2-linux/WordLadder/WordLadder.cpp