edit the makefile
add the solution for Four Sum
Merge branch 'dev'