fix routes files and solve merge conflicts
Merge pull request #16 from RKim220/angular

fix routes files and solve merge conflicts