File with instruction to make a Merge.
and update .gitignore
FreeRTOS.h updating with fixes lost the FreeRTOS 7.4.0
malloc.c file restored from the last release of the 1.0.x Arduino