formatting the source file
update from uchicago
merge from uchicago
Merge branch 'master' of https://github.com/chengjuwang/cc150

Conflicts:
	q11.cpp