Troisème essaie adj pour commiter la même chose -_-
Merge branch 'master' of https://github.com/Charlieee754/JDB into Charlieee754-master

Conflicts:
	tp04/bin/classes/com/example/tp04/Journal$1.class
	tp04/bin/classes/com/example/tp04/Journal.class
	tp04/bin/classes/com/example/tp04/MainActivity.class
	tp04/bin/classes/com/example/tp04/TimeTrackActivity.class
	tp04/bin/classes/com/example/tp04putain/R$string.class
	tp04/bin/classes/com/example/tp04putain/R$style.class
	tp04/res/values/strings.xml
	tp04/src/com/example/tp04/Journal.java
Merge pull request #18 from SDenis-STH/Charlieee754-master

Charlieee754 master