JJP: reformating, updating, adding gitignore
fixed untracked files