LOLOL COMMIT GOGOL
Merge branch 'master' of https://github.com/Frumba/QiQi