RESOLVED conflict in stash
CHANGED currentUser to targetUser
UPDATED spacing
Merge pull request #41 from josephktcheung/angular

Angular