Merge branch 'Ebby'
syncing
Merge branch 'master' into Ebby
images load on demand instead of at the start
Merge branch 'master' into Ebby
Merge pull request #16 from ebbyw/Ebby

Ebby