puzzle
Merge branch 'master' of https://github.com/nifei/Algs

Conflicts:
	collinear/.idea/workspace.xml