Merge pull request #18 from erumble/feature/entry_improvements

Feature/entry improvements
merging development
spacing the rows by an arbitrary 20 px...
making contest work