Adding a bunch of assets
Merge branch 'master' of github.com:jnurse/nurture

Conflicts:
	assets/www/index.html