Line endings normalization
Merge branch 'master' into production
Ongoing fixes for previous line endings -- avoiding resetting the whole repo at once.
Merge branch 'master' into production
Merge branch 'master' into production
Local mods
finished merge into branch
Normalize line-endings
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Implemented publish/unpublish for competitions. Updated competition list to only show published competitions.

Will need to publish active competitions in production to ensure this doesn't change behavior.
Commented out "unpublish" and therefore, "delete" for competitions that have been published.
normalize line endings
updated git ignore
Merge branch 'umaster'
Increased read timeout from default 60 to 1200 seconds.
Merge pull request #279 from irjudson/irj

Merging modifications for edit/delete, so I can deploy to test.
Merge remote-tracking branch 'upstream/master'