Merge pull request #1 from jpark1120/master

created likes and linkfiles controller
test commit checking to see merge conflict behavior