end of week 2
Merge branch 'master' of https://github.com/mayaSun/myflix into week2

pull from master to week2
fix all the find assertion in the controllers
Merge pull request #3 from mayaSun/week2

end of week 2