bugs
Good
Merge branch 'master' of https://github.com/roddehugo/NF16

Conflicts:
	tp3.c
	tp3.h