problem 1 modified
modified 1 and 3
Merge branch 'master' of https://github.com/bvds/LaitsV3