background
merge conflict
some style and background changes
Merge pull request #126 from indotek68/master

Styling changes