ignore .DS_Store
ignore .DS_Store
cleanup
Merge branch 'master' of github.com:FITeagle/api