ㅅ
Merge branch 'master' of https://github.com/wildrunner/algorithm

Conflicts:
	main.cpp