resolving conflicts to push JS tweak
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' of github.com:lathropd/reflowjs into gh-pages
file system reorganization
changed code references in .html files