updated makefile, added server uploading and updating