moved some functions around
refactored duplicate name checking
resolved conflicts
Merge branch 'master' of github.com:GHowlett/Contact-Word-Game