test merge conflict
fix conflict
added files
remove files
test test
Merge pull request #14 from jaryroxas/test-branch

test merge conflict