Commented/removed unneeded styles
Fixed background images
Merge branch '18coffees-fixedBG' into 18coffees-dev
Merge branch '18coffees-dev' into 18coffees-newFooter

Conflicts:
	18coffees/css/main.css

Resolved; removed unnecessary style