account for if error in choosing name
Merge branch 'master' of github.com:swillard13/Spaceteam