Resolving conflicts
[#AE-88] - Setting angular library as minified
[#AE-88] - Testing unit service test
Deleting controller not working test
Merge pull request #113 from djacedj/edit

[#AE-88] - Cecilia can edit a showroom description