fixing gitignore
cleaning up merge mess
fixing .gitignore