Updated scripts and Makefile
fixed Makefile
Removed merge headers from script
Merge pull request #53 from tjd08a/master

Fixed Makefile