There's lot's of stuff added hehe
Merge branch 'master' of https://github.com/felixmulder/cvinator