clearing up Android folder
Merge branch 'master' of https://github.com/cszarapka/eece_381
all src files from Johnny and Amber