adding larger logo
new task changes'
fixing conflicts
Merge remote-tracking branch 'origin/jimmy-frontend' into frontend
Merge remote-tracking branch 'origin/jimmyfrontend2' into frontend
Commit merger
random changes
Minor css
Merge remote-tracking branch 'origin/jimmy-frontend2' into frontend