Merge branch 'master' of https://github.com/gardners/2014SE3
Merge branch 'master' of https://github.com/gardners/2014SE3
Merge branch 'master' of https://github.com/gardners/2014SE3
Merge branch 'master' of https://github.com/gardners/2014SE3
Merge branch 'master' of https://github.com/gardners/2014SE3
Checkpint 8 for vald0002
Merge pull request #131 from andresva700/master

checkpoint Number 8 for vald0002