Changed o to O.
Merge branch 'master-bjorni2'

Conflicts:
	movies.txt