ed
Merge branch 'master' of https://github.com/ncosmin2001/angular2