Finished iOS version

Android still a work in progress