Merge branch 'gh-pages'

Conflicts:
	.idea/workspace.xml
	views/pizza.html