new project
Merge branch 'master' of https://github.com/salv236/Company_Projects

Initial upload of EDRI project 21/12/2014@22:35