Fixing merge conflicts
Merge branch 'master' of github.com:vashar512/TellUsWho2