Initialized repository
Merge branch 're-fixed folder collision'