deleted a stray git merge line that was causing issues with the Django Server causing a Python Syntax Error
Updated models merge develop
Merge branch 'master' into develop
Changed person model, added addpersonserializer, edited peopleserializer
Merge branch 'back' into develop