commit
Merge remote-tracking branch 'origin/master' into gh-pages
initial commit of newest android project. functioning now
Merge remote-tracking branch 'origin/gh-pages'