q to g
gerge branch 'master' of github.com:kacper-zylka/OxHack2014