modifs
Merge branch 'master' of https://github.com/Syst54/uqacnote

Conflicts:
	UQACNote/src/com/example/uqacnote/VideoEdit.java