Added all files.
merge conflict.
publishing minor aesthetic changes.
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
publishing
Merge branch 'master' into gh-pages
publishing
Merge branch 'master' into gh-pages
publishing for testing in pjs.
merged
Merge branch 'master' into gh-pages
publishing
minor refactoring. Much more to be done.
Merge branch 'gh-pages'