created demo
created a demo
Merge pull request #16 from haem/master

demo created
Merge local changes with upstream
Merge pull request #17 from andreafrost/master

Merge local changes with upstream
Fix merge conflict between upstream and local javascript.