merged style.css with main.css

+
Merge branch 'master' of https://github.com/crillesvensson/WebApplikationer

Conflicts:
	Group4Shop_App/src/main/webapp/content/contact.html
	Group4Shop_App/src/main/webapp/content/help.html
	Group4Shop_App/src/main/webapp/content/home.html
	Group4Shop_App/src/main/webapp/content/products.html
	Group4Shop_App/src/main/webapp/index.html
	Group4Shop_App/src/main/webapp/resources/css/main.css