Merge File
Update Makefile
Merge branch 'master' of https://github.com/STM32F429I-DiscoPhone/STM32F429I-DiscoLCD

Conflicts:
	FreeRTOS/phone.c
	FreeRTOS/phone.h