Merge branch 'master' of github.com:mastacontrola/fogproject