Can now compile
Merge branch 'master' of https://github.com/jpleitao/projecto-cg