Have the ability to deactivate your account
Merge branch 'master' of ssh://git@github.com/kbaylor/movienet.git

Conflicts:
	MovieNet/MovieNet/settings.py
	MovieNet/movieapp/urls.py