added (almost) adding problems
merge
Merge branch 'master' of https://github.com/stefan-avramov/Salata