ugh
Merge branch 'master' of https://github.com/nickbdavis/GhostChat2

Conflicts:
	GhostChat/AndroidManifest.xml
	GhostChat/bin/AndroidManifest.xml
	GhostChat/bin/GhostChat.apk
	GhostChat/bin/R.txt
	GhostChat/bin/classes.dex

GhostChat/bin/classes/com/example/ghostchat/MainActivity$PlaceholderFrag
ment.class
	GhostChat/bin/classes/com/example/ghostchat/MainActivity.class
	GhostChat/bin/classes/com/example/ghostchat/R$layout.class
	GhostChat/bin/classes/com/example/ghostchat/R$menu.class
	GhostChat/bin/classes/com/example/ghostchat/R$string.class
	GhostChat/bin/classes/com/example/ghostchat/R$style.class
	GhostChat/bin/classes/com/example/ghostchat/R$styleable.class
	GhostChat/bin/resources.ap_
	GhostChat/gen/com/example/ghostchat/R.java
	GhostChat/res/values/strings.xml
	GhostChat/src/com/example/ghostchat/MainActivity.java