update
home
Merge branch 'master' of https://github.com/cottalucas/iPromise

Conflicts:
	iPromise/www/index.html