fix conflict
Merge branch 'master' of github.com:mmartin8910/myflix

Conflicts:
	dump.rdb

Finish.