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

Conflicts:
	Fix4Me/urls.py
	fixes/views.py