Initial commit
initial commit; not everything is working...
Merge branch 'master' into gh-pages