More work on iOS
Merge branch 'master' of github.com:asharma93/hackathon-app