old
Merge branch 'master' of https://github.com/jeffry-gao/codejam

Conflicts:
	2013-1ca/1ca.cpp
solved small