test commit checking to see merge conflict behavior
testing conflicting commits with joe
Merge pull request #2 from jpark1120/master

test commit checking to see merge conflict behavior
test commit for merge conflict round 2
testing merge conflcit again
merge conflict resolution practice
Merge pull request #3 from jpark1120/master

test commit for merge conflict round 2
deleted practice code from controllers
gibberish for branching practice
testing branching on git
merge conflict practice
still testing branching
merge conflict practice 2
practicing branching
testing branching
practicing merges
Merge branch 'master' of github.com:LizCira/jobfrog
got rid of merge conflict practice code
removed practice code
Merge pull request #4 from jpark1120/master

remove practice code