working ios app
Mashups working on ios
mashups work on android now
Final commit week 4
fix