test added
Merge branch 'master' of github.com:Kilhwch/Ohtu1
tests fixed
grunt:watch configuration updated