first part GP2
Merge branch 'master' of https://github.com/jgalinha/lp_1415_13077_13130