Partials
Merge branch 'development'
Partials
Merge branch 'master' of github.com:DSI-ETSII-ULL/2014-Coca-Cola
Merge branch 'development'