now really added folder/*
Merge branch 'master' of https://github.com/andreiavrammsd/helloworld