Added solution to problem 1
Merge branch 'master' of github.com:Alejandro131/OOP2014