! Merge code with justin + add new logo and flash screen