blah
Changes settings for local use
Merge branch 'master' of https://github.com/dkellycollins/CIS560_TeamProjects

Conflicts:
	bob/views.py
cleaned up repo, fixed manageCustomer syntax
Fixing register
this is a bad idea
Registration a little less annoying. Zipcode.zip is not the pk apparently, so that will break
when that is fixed. Customer now has a foreign key for user. Onthe bright side, lots of things to write down tomorrow
for problems we ran into if I can remember them
Merge branch 'auth' of https://github.com/dkellycollins/CIS559_TeamProjects into frontend

Conflicts:
	bob/views.py