entry edit
merging development

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

Feature/contest edit