admin.py
Merge branch 'master' of github.com:hackmontgomery/foiaface

Conflicts:
	foiaface/models.py
app setting
Merge branch 'master' of github.com:hackmontgomery/foiaface

Conflicts:
	foiaface/admin.py
	foiaface/settings.py