Get changes synced up
Added logout and some ratings stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	MovieNet/MovieNet/templates/movieapp/find_form.html
	MovieNet/movieapp/urls.py
	MovieNet/movieapp/views.py
Merge branch 'master' of ssh://github.com/kbaylor/movienet

Conflicts:
	MovieNet/movieapp/views.py