merge mit Simon
Merge branch 'master' of https://github.com/chrizzTs/Who-U