edited new test script
merge makefile conflict

took the makefile from git
Merge branch 'master' of https://github.com/YichiLL/4115PLT

Conflicts:
	Makefile