Added some static content and took away the yaml files
committing settings.py to local
Merge remote-tracking branch 'origin/master'
took my password out of settings.py
commiting new views and search forms, and actor costar list
trying to merge again -_-
i hope this works, trying to resolve a bunch of merge conflicts from rebasing.