I hate dolphins, and Jesse likes to eat his own poop
oinwciuabqvqiebveirub
Merge github.com:Mriegel/smackchat

Conflicts:
	BarBets/bin/BarBets.apk
	BarBets/bin/classes.dex
	BarBets/bin/classes/com/example/barbets/HomePage$TabListener.class
	BarBets/bin/classes/com/example/barbets/HomePage.class
	BarBets/src/com/example/barbets/HomePage.java
.xml's done -MM