rename Android source and update journal
Merge branch 'master' of github.com:ohearnk/CS467
conflict on Justin & Chris' branch