Initialized and added starter kit
Fixed merge conflict