start on android
forgot to add the file
android now works but broke ios for now
Merge branch 'android'