list remotes
Merge branch 'master' of https://github.com/ExpoTeam/expo
add remotes
fix conflicts in slideshows.js and router.js
fix conflicts in slideshow.html