still broken but commiting

Fuck it
Merge branch 'master' of https://github.com/pjhaugh/SDU-CAPSTONE-PHONEBOOK