Merge pull request #2 from cheile01/master

Merge pull request #6 from lmacha02/master
Merge pull request #3 from cheile01/master

meeting 1
bla
customer and controller
Merge pull request #8 from lmacha02/luisDevelopment

Merge pull request #2 from cheile01/master