MarkUsProject/Markus — pull request #1785 by nathanychow (2014-09-22 04:46:26+00:00)
Title: Image annotation r spec

Added rspec tests for image_annotations

the reason you see so many commits stems from the messed up push I did during the sprint. I accidentally pushed changes to my master branch, and I don't think I ever deleted them from the master branch of my repo, so they ended up in this branch and thus showed up in this pull request (this is my hypothesis anyways).

So the additional commits were to take out those changes from this pull request.