Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Profile img fix in navbar
first take on dashboard
Merge pull request #37 from comzeradd/dashboard

First take on dashboard
Merge pull request #36 from ppapadeas/profile-img-fix

Profile img fix in navbar