Making branding a tidbit easier
Merge remote-tracking branch 'gitlab/etriks-1.2' into michigan-hackathon-se-1.2