adding
Merge remote-tracking branch 'origin/master'

Conflicts:
	algorithms/StringToInt.cpp
adding
Merge remote-tracking branch 'origin/master'