syncing
Merge branch 'master' of github.com:stanzheng/120CppIdeas

Conflicts:
	Euler/2/2
	Euler/2/problem.o
	Euler/3/problem.cpp
	triangles/main
	triangles/main.cpp