all tests pass
Merge branch 'master' of github.com:havok2905/Mobile-API