Merge pull request #15 from RKim220/angular

Angular
fix routes files and solve merge conflicts