cleaned up code
Merge branch 'master' of https://github.com/swiss42/AI2014
blaa