modifying git ignore file
merging and resolving some conflicts