created Git repo
added .project
resolved some conflicts