Movie - dummy comment
Merge branch 'master' of github.com:rhulek/muni-fi-pb138-2013-videoteka
ExampleFile modification
Merge branch 'master' of github.com:rhulek/muni-fi-pb138-2013-videoteka

Conflicts:
	VideoLibrary/src/main/java/com/mycompany/videolibrary/Movie.java
	VideoLibrary/src/main/java/com/mycompany/videolibrary/experimental/ODFParserExample.java