adding my name
fixing merge conflict
Merge branch 'master' of https://github.com/JOUR491-NewsApplications/JOUR491-Parking