Commented out canvas init to preserve menu functionality
Merge branch 'master' of github.com:zhbanton/photo_mixer
Commented out CanvasApp to preserve dropdown functionality
Merge branch 'master' of github.com:zhbanton/photo_mixer into tag_cloud

Conflicts:
	app/assets/javascripts/main.js