Merge branch 'master', remote-tracking branch 'origin' into status_on_talks
Merge remote-tracking branch 'origin' into status_on_talks
Added some properties on talks
Added some properties on talks
added some colors to navbar
resolved conflict
minore DOM update to carousel
solved conflict