notes and Makefile edited
Conflicts solved