adding git ignore
fixing merge conflict
Merge pull request #4 from YetiHQ/master

Merge pull request #3 from YetiHQ/develop
fixing register_api return
Merge branch 'develop' of github.com:YetiHQ/manticore-tastypie-urbanairship into develop
Merge pull request #5 from YetiHQ/develop

fixing register_api return