Editing gitignore
fixing untracked files
Merge branch 'master' of https://github.com/dplucenio/flying-things