add canvas
adding log statements
Merge branch 'master' of github.com:suhan1021/3213Team12

Conflicts:
	coincide/coincide/static/scripts/app/controllers/ApplicationController.js
	coincide/coincide/static/scripts/config.js