added tacky background
fixed merge issues
Merge branch 'master' of https://github.com/mwcaisse/webware-final