navbar
color changes
styling
splash page artwork
cleanup edits
fixed merged conflict