added personal introduction
removed conflicts
Merge branch 'master' of https://github.com/CodenamePWNsauce/testing2