made a bunch of modifications
merged gitignore files