Second revision (myself)
Merge branch 'master' of github.com:paivaspol/SeniorThesis