Added strong params to votes
Users can now draw on cavas with images as background on comments index page
User can draw, off-centeredly, on a canvas with image as background
committing so I can switch branches
Users can draw on images

*Users can draw in any color they want as long as it's black.
Added count method to category model
Merge pull request #48 from zhbanton/tag_counts

Added count method to category model
Merge pull request #47 from zhbanton/add_canvas

Add canvas
Merge branch 'master' of github.com:zhbanton/photo_mixer into slider

Conflicts:
	app/assets/javascripts/main.js
	app/views/layouts/application.html.erb
removed sticky class on filter button