rethemed
Merge pull request #36 from erumble/rethemeify

rethemed
entry edit
merging development

Conflicts:
	app/views/entries/index.html.erb
Merge pull request #38 from jbrewton/feature/contest_edit

Feature/contest edit
add entry_num to entry
merge in dev
stopping double people
Merge pull request #40 from jbrewton/feature/contest_edit2

stopping double people
number chalice
merge in dev
update entry number on skill_level change if necessary
update entry num if hot_or_bulky changes
remove comments
adding well to wrap people
row spacing
restoring pagination css for data table
removing user controls
Merge pull request #41 from jbrewton/quick_ui_polish

Quick ui polish
Merge branch 'development' into feature/entry-numbers