demo done

# Conflicts:
#	Demo.js
