Users can draw on images without it breaking our menus! !!
Merge branch 'master' into add_canvas

Conflicts:
	app/assets/javascripts/main.js
Merge pull request #54 from zhbanton/add_canvas

Users can draw on images without it breaking our menus! !!