Changes made by Andre Almeida (andremoreiradealmeida@gmail.com).
Changes made by Andre Almeida (andremoreiradealmeida@gmail.com).
Merge branch 'master' of https://github.com/bernardxf/nowpizza.git
Changes made by Andre Almeida (andremoreiradealmeida@gmail.com).
Merge branch 'master' of https://github.com/bernardxf/nowpizza.git

Conflicts:
	nowpizza/index.html