update before ex3
Merge branch 'master' of github.com:Tessmore/gr_v4