Updated makefile and renamed server to sample_server temporarily