avatar selection testing
Merge branch 'avatar_test'
Adjusted some database and merged avatars
Merge branch 'master' of https://github.com/swillard13/Spaceteam