Merging with latest changes
Merge branch 'master' of github.com:rzhou186/CompCanvas
Merge branch 'master' of github.com:rzhou186/CompCanvas
Used HTML buttons instead of oCanvas buttons.