More modules
Merge branch 'master' of github.com:LeShadow/hackiothon