Firt 2 queries and part of 3
Merge branch 'master' of https://github.com/sissiparo/Sprint2