Basic project setuop
Corrects merge conflicts from generated gtiignores