Added shoulda matchers and factory girl.  Updated all tests
tests are passing
Corrected Gemfile.lock to include all dependancies

Merge branch 'master' of https://github.com/fox-squirrels-2013/gif_overflow

Conflicts:
	Gemfile.lock
Pulling Voting Model into Testing Branch

Merge branch 'master' into testing
Deleted 'p' ruby commands.
Added Upvote Tests
Merge pull request #12 from fox-squirrels-2013/testing

Testing