delusional
fixed conflict
Merge branch 'master' of github.com:weshack/WesPeople.com
started a little script to scrub the name data, not quite finished
conflict resolution