update
fix merge conflict
remove tmp files
Merge pull request #15 from RKim220/angular

Angular