fixed background
fixed background
fixed merege conflict
Merge pull request #128 from indotek68/master

Fixed background