added project to git
merged with local