pa43
Merge branch 'master' of https://github.com/RobertHren/PizzaAppBeta

Conflicts:
	index_black.html
	index_green.html
	index_vintage.html
	index_visnja.html