Refactor GAPCAL
Merge branch 'master' of https://github.com/razinanu/ottocar