Software License
Merge branch 'master' of https://github.com/semvidEAFIT/project-decubed

Conflicts: