updated makefile with masterserver, put test image passing in testfolder