Makefile updated

Signed-off-by: ETFernandes <eduardotf93@gmail.com>
Merge branch 'master' of github.com:ETFernandes/SE1Repo

Conflicts:
	development/apps/Lab7-Flash/Makefile

Signed-off-by: ETFernandes <eduardotf93@gmail.com>