Reinitialized repository
Merge branch 'fixed folder collision'