did nothing...
hello
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml
conflict fixed, login button added
gui stuff by
Working program
for ron
hi
Merge branch 'master' of https://github.com/marvinmarnold/sup
not working version
Working version
working project
hi
Merge remote-tracking branch 'origin/master'
something
h
Gives the name now
got stuff from fb
Success on list view