Merge pull request #1 from andrewvergel/dev

Dev
fixed untracked files