Finished tests for the whole project, probably
Fixed merge conflict in round controller spec
Testing
Tests are passing
Merge pull request #36 from kz363/master

Tests are passing