pushing up psds
fixing conflict
adding app icon