Fixed error regarding new comment submission with turbolinks
changed variable name
addressed merge conflict in gemfile
changed variable name
Merge branch 'ajaxify_votes' of github.com:zhbanton/photo_mixer into ajaxify_votes

Conflicts:
	Gemfile
Merge pull request #9 from zhbanton/ajaxify_votes

Ajaxify votes