Merge pull request #1 from nickgrifka/master

getting the android files from spencer