Merge pull request #1 from victorpearson/Add_Users

Add users
added shoulda gem for testing
added basic model tests, some don't pass
Merge pull request #2 from victorpearson/Image_uploading

Image uploading
Merge pull request #4 from victorpearson/Add_Tests

Add tests
Merge pull request #6 from victorpearson/adding-layout

Adding layout
Merge pull request #7 from victorpearson/fix-duel-model

Fix duel model
Merge pull request #8 from victorpearson/voting

Voting
fixed conflict