updated gitignore and reformatted some files