resolving conflicts to push JS tweak
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge pull request #2 from emilymerwin/master

Admin page tweaks
Merge branch 'master' of github.com:lathropd/reflowjs into gh-pages
file system reorganization
changed code references in .html files
source code formatting cleanup on html files
formatted non-vendor css files
formatted non-vendor js files
small additional admin cleanup
fixed admin clearing non-form inputs on loading
renamed dropboxFiles.js to admin.js
moved additional css, js files to vendor directories. deleted some unused files.
modified admin page to have links to iframe file and data file rather than putting the data into input fields
fixing index.html links to  vendor js files that were moved a second
time
fixing index.html links to  vendor js files that were moved a second
time
Instructions tweaks
Fix invalid HTML
Delete duplicate script?

Was this in there twice for a reason?