g&s

Signed-off-by: Lorentz Rossbacher <lancetekk@googlemail.com>
Merge branch 'master' of git@github.com:lancetekk/webeng.git