fixed index controller merge conflict
Merge pull request #11 from kevinbuch/round_views

fixed index controller merge conflict