My stuff, edits to android.
Merge branch 'master' of git@github.com:Jashinta/451_Prject.git