vlc project
version 1\
Hello world

Merge remote-tracking branch 'upstream/master'