* Ajout du code tBatterie
Delete fonctions.c~
Delete fonctions.o
Delete global.c~
Delete global.o
Delete script.sh~
Delete main.o
Merge branch 'master' of ssh://github.com/MarcOrfila/INSATempsReel

Conflicts:
	TempsReel/projet_destijl_2014/projet_initial/fonctions.c~
	TempsReel/projet_destijl_2014/projet_initial/fonctions.o
	TempsReel/projet_destijl_2014/projet_initial/global.c
	TempsReel/projet_destijl_2014/projet_initial/global.o
	TempsReel/projet_destijl_2014/projet_initial/main.o