Merge branch 'master' into chats
updated logo
Merge branch 'master' into chats
fixed semester timeline
Merge branch 'master' into chats
fixed days timeline
Merge branch 'chats'
fixing small CSS issues
fix open chat window on after include
Merge remote-tracking branch 'origin/master'
styled nav
Merge branch 'master' into chats
Merge branch 'master' into chats
fixed icons on feeds, added course nav
Merge branch 'chats'
Merge branch 'master' into chats
some fixes to CSS
Merge branch 'chats'
Feed. Updated template and styling. Added 'video' property to feed object.
Merge branch 'master' of https://github.com/ArsenBatyuchok/elearning into feed-sorting