Finished

and fixed gitignore