added some more comments, and refactored some variable names
added some more comments
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team2