Merge branch 'master' of https://github.com/chidieberennadi/TranzChat

Conflicts:
	build/classes/tranzchat/Auth.class
	src/tranzchat/Auth.java