final week 2
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store
	assets/www/.DS_Store