Delete file
Merge remote-tracking branch 'gitHub/master'
fixed makefile