adding our report
using nattys makefile
gitignorestuff
fixing merge conflict in makefile