added listview for stuffffff
Merge remote-tracking branch 'origin/master'
password and username stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/intrivix/animaapp/AnimaHome.java