removed file
removed local.properties
Merge branch 'master' of https://github.com/csulbacm/ScrambledEggs
changetext