added edit form, changed index to home, fixed urls, etc
merged changes to settings.py
merged changes to settings.py