I did stuff
Merge branch 'master' of github.com:WD40-RU2013/excercise

Conflicts:
	movies.txt