Restored reset.sh script to it's old form
Merge branch 'master' of github.com:magnet-cl/django-project-template

Conflicts:
	reset.sh