Added user sonny
Merge branch 'master' of https://github.com/sonnyw/ems20