added angularJS but ng-repeat isn't working
fix conflicts