aula2 list.c
Merge branch 'master' of https://github.com/killmaster/SO2013

Conflicts:
	aula2/list.c
Merge branch 'master' of https://github.com/killmaster/SO2012

Conflicts:
	aula2/Makefile
	aula2/list.c
	aula2/list.h
	aula2/main.c
	aula3/main.c