added hill climbing theory
report merge errors
Merge branch 'master' of http://github.com/sagieske/AA1
Merge branch 'master' of http://github.com/sagieske/AA1
added optimal values