Merge branch 'editcontestant' of https://github.com/brusher/Full-House.git into editcontestant