ajout des heures des films + Playing today
gitignore
manifest
all :/
merge
manifest
gitignore
all
Merge remote-tracking branch 'origin/Caro'

now do not touch to gitignore

Conflicts:
	What2Watch/.gitignore
	What2Watch/bin/What2Watch.apk
	What2Watch/bin/classes.dex
	What2Watch/bin/resources.ap_