Irrelevant Modifications
Merge branch 'master' of https://github.com/dieg0-/mas-2014ws-project
Merge remote-tracking branch 'upstream/master'