asdf
Merge branch 'master' of github.com:adurenator/Fix4Me

Conflicts:
	Fix4Me/settings.pyc
	fixes/models.py