fixed test section errors
making changes to gitignore
fixing conflicts