added my name, and feedback
add jeevan
fix conflict
Merge branch 'master' of github.com:petelewis/aston-git-people