merging code
fixing gitignore