Initial commit'
Merge branch 'master' of https://github.com/kacper-zylka/OxHack2014