debug
Merge branch 'master' into gs

Conflicts:
	tasks/simple_mutex/simple_mutex.o
pending
Merge branch 'master' of https://github.com/Luciferre/embedlab4