Merge pull request #1 from mariokonrad/master

Please pull initial commit for infrasturcture building.