Merge pull request #1 from californiavol/imac-branch

merge Imac branch into master
began work on person model and person json
Merge remote-tracking branch 'origin/macbook-branch' into imac-branch