ignoring DS_Store
Merge branch 'master' of github.com:arschles/gotp