updated
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store
	mysite/images/.DS_Store
	mysite/images/flower.jpg