bit of clean up
added gitignore
fixing conflicts and incorporating gitignore