Updated makefile
Merge branch 'master' of https://github.com/ilovepi/NCD

Conflicts:
	makefile