add ftn_deps to gitignore
resolve confilct in gitignore
removed ftn_deps
Merge branch 'master' of github.com:bcumming/ftn_deps