Likes
Fix merge conflict
Merge branch 'master' of github.com:schfkt/coursehub