adding angular
merging files