fixed DIFF content still showing up in file
Merge branch 'master' of https://github.com/astephen2/DisasterRegistry

Conflicts:
	disaster/disaster/urls.py