optimized image
New pages added
about page added
Merge branch 'master' into gh-pages

Conflicts:
	about.html
	shop.html
misc changes
misc change
misc change 2