initial commit

By Glenn Coessens
Merge branch 'master' of https://github.com/glenncoessens/projectmultimedia