added background
Merge remote-tracking branch 'refs/remotes/origin/master'
Added all the stuff and icon