component css
Merge remote-tracking branch 'upstream/master'
Merge pull request #13 from vazquez/master

Fixing merge conflicts
feat(header): introduced logo size changing
Merge remote-tracking branch 'upstream/master'