Added recursive make
Resolved conflict ES homework