.
Merge remote-tracking branch 'origin/master'

Conflicts:
	iPromise/www/index.html
Merge branch 'master' of https://github.com/cottalucas/iPromise