Merge pull request #3 from jpark1120/master

test commit for merge conflict round 2
testing branching on git
still testing branching
practicing branching
testing branching
Merge branch 'master' of github.com:LizCira/jobfrog
removed practice code