Fixed errors
Merge branch 'master' of github.com:julianaleon8/IA2_2014