trying to commit yaml fixtures
Merge branch 'master' of git://github.com/kbaylor/movienet
Merge branch 'master' of git://github.com/kbaylor/movienet
Merge branch 'master' of git://github.com/kbaylor/movienet
Adding urls.py, views.py