Changed names.txt and added file into people directory
fixed conflict
Merge branch 'master' of github.com:petelewis/aston-git-people