portfolio pix, table, fonts
Merge branch 'scott' of github.com:bdxhosting/laurendennishair into sc
Conflicts:
	.idea/workspace.xml
	templates/index.html