committing to master
Initial commit
Merge branch 'master' into gh-pages
website with css and javascript