modified activity_main.xml
test
Merge branch 'sdebellis' of https://github.com/pdxacm/Android-Projects
modified activity_main.xml
my changes
commit
fixed weird stuff