bugfix
Merge branch 'exercise1' of https://github.com/mimacom/movie-manager into exercise1